← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gtk-doc.make

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk-doc.make
23
23
 
24
24
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
25
25
 
26
 
EXTRA_DIST =                            \
 
26
SETUP_FILES = \
27
27
        $(content_files)                \
28
 
        $(HTML_IMAGES)                  \
29
28
        $(DOC_MAIN_SGML_FILE)           \
30
29
        $(DOC_MODULE)-sections.txt      \
31
30
        $(DOC_MODULE)-overrides.txt
32
31
 
33
 
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
34
 
        pdf-build.stamp \
35
 
        $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
36
 
        $(srcdir)/pdf.stamp
 
32
EXTRA_DIST =                            \
 
33
        $(SETUP_FILES)
 
34
 
 
35
DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
 
36
        html-build.stamp pdf-build.stamp \
 
37
        setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
37
38
 
38
39
SCANOBJ_FILES =                  \
39
40
        $(DOC_MODULE).args       \
70
71
 
71
72
$(REPORT_FILES): sgml-build.stamp
72
73
 
 
74
#### setup ####
 
75
 
 
76
setup-build.stamp:
 
77
        -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 
78
           echo 'gtk-doc: Preparing build'; \
 
79
           files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 
80
           if test "x$$files" != "x" ; then \
 
81
               for file in $$files ; do \
 
82
                   test -f $(abs_srcdir)/$$file && \
 
83
                       cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
 
84
               done \
 
85
           fi; \
 
86
           test -f $(abs_srcdir)/tmpl && \
 
87
               cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 
88
        fi
 
89
        @touch setup-build.stamp
 
90
 
 
91
 
 
92
setup.stamp: setup-build.stamp
 
93
        @true
 
94
 
 
95
 
73
96
#### scan ####
74
97
 
75
98
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
76
99
        @echo 'gtk-doc: Scanning header files'
77
 
        @-chmod -R u+w $(srcdir)
78
 
        @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
 
100
        @_source_dir='' ; \
 
101
        for i in $(DOC_SOURCE_DIR) ; do \
79
102
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
80
 
          done ; \
81
 
          cd $(srcdir) && \
82
 
          gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
83
 
        @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
84
 
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 
103
        done ; \
 
104
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 
105
        @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 
106
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
85
107
        else \
86
 
            cd $(srcdir) ; \
87
108
            for i in $(SCANOBJ_FILES) ; do \
88
109
               test -f $$i || touch $$i ; \
89
110
            done \
95
116
 
96
117
#### templates ####
97
118
 
98
 
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 
119
tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
99
120
        @echo 'gtk-doc: Rebuilding template files'
100
 
        @-chmod -R u+w $(srcdir)
101
 
        @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 
121
        @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 
122
        @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 
123
          if test -w $(abs_srcdir) ; then \
 
124
            cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
 
125
          fi \
 
126
        fi
102
127
        @touch tmpl-build.stamp
103
128
 
104
129
tmpl.stamp: tmpl-build.stamp
112
137
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
113
138
        @echo 'gtk-doc: Building XML'
114
139
        @-chmod -R u+w $(srcdir)
115
 
        @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
 
140
        @_source_dir='' ; \
 
141
        for i in $(DOC_SOURCE_DIR) ; do \
116
142
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
117
 
          done ; \
118
 
          cd $(srcdir) && \
119
 
          gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 
143
        done ; \
 
144
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
120
145
        @touch sgml-build.stamp
121
146
 
122
147
sgml.stamp: sgml-build.stamp
126
151
 
127
152
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
128
153
        @echo 'gtk-doc: Building HTML'
129
 
        @-chmod -R u+w $(srcdir)
130
 
        @rm -rf $(srcdir)/html
131
 
        @mkdir $(srcdir)/html
 
154
        @rm -rf html
 
155
        @mkdir html
132
156
        @mkhtml_options=""; \
133
157
        gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
134
158
        if test "$(?)" = "0"; then \
135
 
          mkhtml_options=--path="$(srcdir)"; \
 
159
          mkhtml_options=--path="$(abs_srcdir)"; \
136
160
        fi; \
137
 
        cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
138
 
        @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 
161
        cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 
162
        -@test "x$(HTML_IMAGES)" = "x" || \
 
163
        for file in $(HTML_IMAGES) ; do \
 
164
          if test -f $(abs_srcdir)/$$file ; then \
 
165
            cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
 
166
          fi; \
 
167
          if test -f $(abs_builddir)/$$file ; then \
 
168
            cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 
169
          fi; \
 
170
        done;
139
171
        @echo 'gtk-doc: Fixing cross-references'
140
 
        @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 
172
        @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
141
173
        @touch html-build.stamp
142
174
 
143
175
#### pdf ####
144
176
 
145
177
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
146
178
        @echo 'gtk-doc: Building PDF'
147
 
        @-chmod -R u+w $(srcdir)
148
 
        @rm -rf $(srcdir)/$(DOC_MODULE).pdf
 
179
        @rm -rf $(DOC_MODULE).pdf
149
180
        @mkpdf_imgdirs=""; \
150
181
        if test "x$(HTML_IMAGES)" != "x"; then \
151
182
          for img in $(HTML_IMAGES); do \
156
187
            fi; \
157
188
          done; \
158
189
        fi; \
159
 
        cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 
190
        gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
160
191
        @touch pdf-build.stamp
161
192
 
162
193
##############
166
197
        rm -rf .libs
167
198
 
168
199
distclean-local:
169
 
        cd $(srcdir) && \
170
 
          rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
171
 
                 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
200
        rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 
201
            $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
202
        if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 
203
            rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 
204
            rm -rf tmpl; \
 
205
        fi
172
206
 
173
207
maintainer-clean-local: clean
174
 
        cd $(srcdir) && rm -rf xml html
 
208
        rm -rf xml html
175
209
 
176
210
install-data-local:
177
211
        @installfiles=`echo $(srcdir)/html/*`; \
219
253
dist-hook: dist-check-gtkdoc dist-hook-local
220
254
        mkdir $(distdir)/tmpl
221
255
        mkdir $(distdir)/html
222
 
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
223
 
        cp $(srcdir)/html/* $(distdir)/html
224
 
        -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
225
 
        -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
226
 
        -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 
256
        -cp $(build)/tmpl/*.sgml $(distdir)/tmpl
 
257
        cp $(builddir)/html/* $(distdir)/html
 
258
        -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
 
259
        -cp $(build)/$(DOC_MODULE).types $(distdir)/
 
260
        -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
227
261
        cd $(distdir) && rm -f $(DISTCLEANFILES)
228
262
        $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
229
263