[maemo-commits] [maemo-commits] r10669 - projects/haf/branches/hildon-libs/hildon-1/doc
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Mar 21 10:03:17 EET 2007
- Previous message: [maemo-commits] r10668 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r10670 - projects/haf/branches/hildon-libs/hildon-1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: tko Date: 2007-03-21 10:03:17 +0200 (Wed, 21 Mar 2007) New Revision: 10669 Modified: projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make projects/haf/branches/hildon-libs/hildon-1/doc/visual_index.xml Log: Fix --enable-gtk-doc build 2007-03-20 Tommi Komulainen <tommi.komulainen at nokia.com> * doc/gtk-doc.make: Update from gtk-doc 1.7, and fix '*.sgml' prerequisite with $(wildcard) to work in absence of any files. * doc/Makefile.am (MAINTAINERCLEANFILES): Add 'tmpl/*.sgml' here, it used to be handled in the modified gtk-doc.make (HTML_IMAGES): Fix images locations by adding missing 'images/' * doc/visual_index.xml: Remove extraneous 'html/' from image references that were breaking the generated gallery page. Modified: projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am 2007-03-20 16:36:34 UTC (rev 10668) +++ projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am 2007-03-21 08:03:17 UTC (rev 10669) @@ -1,7 +1,8 @@ MAINTAINERCLEANFILES = Makefile.in \ hildon-sections.txt \ hildon-undocumented.txt \ - version.xml + version.xml \ + tmpl/*.sgml DOC_MODULE = hildon @@ -64,28 +65,28 @@ html: html-build.stamp -HTML_IMAGES = $(srcdir)/images/calendar-popup.png \ - $(srcdir)/images/caption.png \ - $(srcdir)/images/code-dialog.png \ - $(srcdir)/color-button.png \ - $(srcdir)/color-chooser-dialog.png \ - $(srcdir)/color-chooser.png \ - $(srcdir)/controlbar.png \ - $(srcdir)/date-editor.png \ - $(srcdir)/font-selection-dialog.png \ - $(srcdir)/get-password-dialog.png \ - $(srcdir)/hvolumebar.png \ - $(srcdir)/login-dialog.png \ - $(srcdir)/note.png \ - $(srcdir)/number-editor.png \ - $(srcdir)/range-editor.png \ - $(srcdir)/seekbar.png \ - $(srcdir)/set-password-dialog.png \ - $(srcdir)/sort-dialog.png \ - $(srcdir)/time-editor.png \ - $(srcdir)/time-picker.png \ - $(srcdir)/vvolumebar.png \ - $(srcdir)/weekday-picker.png +HTML_IMAGES = $(srcdir)/images/calendar-popup.png \ + $(srcdir)/images/caption.png \ + $(srcdir)/images/code-dialog.png \ + $(srcdir)/images/color-button.png \ + $(srcdir)/images/color-chooser-dialog.png \ + $(srcdir)/images/color-chooser.png \ + $(srcdir)/images/controlbar.png \ + $(srcdir)/images/date-editor.png \ + $(srcdir)/images/font-selection-dialog.png \ + $(srcdir)/images/get-password-dialog.png \ + $(srcdir)/images/hvolumebar.png \ + $(srcdir)/images/login-dialog.png \ + $(srcdir)/images/note.png \ + $(srcdir)/images/number-editor.png \ + $(srcdir)/images/range-editor.png \ + $(srcdir)/images/seekbar.png \ + $(srcdir)/images/set-password-dialog.png \ + $(srcdir)/images/sort-dialog.png \ + $(srcdir)/images/time-editor.png \ + $(srcdir)/images/time-picker.png \ + $(srcdir)/images/vvolumebar.png \ + $(srcdir)/images/weekday-picker.png FIXXREF_OPTIONS = Modified: projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make 2007-03-20 16:36:34 UTC (rev 10668) +++ projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make 2007-03-21 08:03:17 UTC (rev 10669) @@ -26,8 +26,7 @@ $(HTML_IMAGES) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt \ - gtk-doc.make + $(DOC_MODULE)-overrides.txt DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp @@ -43,12 +42,7 @@ if ENABLE_GTK_DOC all-local: html-build.stamp -else -all-local: -endif -docs: html-build.stamp - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @@ -81,8 +75,9 @@ @true #### xml #### +tmpl_files := $(wildcard $(srcdir)/tmpl/*.sgml) -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(expand_content_files) +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(tmpl_files) $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) cd $(srcdir) && \ @@ -104,6 +99,9 @@ @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: +endif ############## @@ -112,7 +110,7 @@ rm -rf .libs maintainer-clean-local: clean - cd $(srcdir) && rm -f tmpl/*.sgml* && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt install-data-local: installfiles=`echo $(srcdir)/html/*`; \ @@ -153,4 +151,4 @@ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ fi -.PHONY : dist-hook-local docs +.PHONY : dist-hook-local Modified: projects/haf/branches/hildon-libs/hildon-1/doc/visual_index.xml =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/doc/visual_index.xml 2007-03-20 16:36:34 UTC (rev 10668) +++ projects/haf/branches/hildon-libs/hildon-1/doc/visual_index.xml 2007-03-21 08:03:17 UTC (rev 10669) @@ -1,68 +1,68 @@ <para role="gallery"> <link linkend="HildonCalendarPopup"> - <inlinegraphic fileref="html/calendar-popup.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="calendar-popup.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonCaption"> - <inlinegraphic fileref="html/caption.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="caption.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonCodeDialog"> - <inlinegraphic fileref="html/code-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="code-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonColorButton"> - <inlinegraphic fileref="html/color-button.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonColorChooserDialog"> - <inlinegraphic fileref="html/color-chooser-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="color-chooser-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonCalorChooser"> - <inlinegraphic fileref="html/color-chooser.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="color-chooser.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonCantrolbar"> - <inlinegraphic fileref="html/controlbar.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="controlbar.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonDateEditor"> - <inlinegraphic fileref="html/date-editor.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="date-editor.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonFontSelectionDialog"> - <inlinegraphic fileref="html/font-selection-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="font-selection-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonGetPasswordDialog"> - <inlinegraphic fileref="html/get-password-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="get-password-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonHVolumebar"> - <inlinegraphic fileref="html/hvolumebar.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="hvolumebar.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonDialog"> - <inlinegraphic fileref="html/login-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="login-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonNote"> - <inlinegraphic fileref="html/note.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="note.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonNumberEditor"> - <inlinegraphic fileref="html/number-editor.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="number-editor.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonRangeEditor"> - <inlinegraphic fileref="html/range-editor.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="range-editor.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonSeekbar"> - <inlinegraphic fileref="html/seekbar.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="seekbar.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonSetPasswordDialog"> - <inlinegraphic fileref="html/set-password-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="set-password-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonSortDialog"> - <inlinegraphic fileref="html/sort-dialog.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="sort-dialog.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonTimeEditor"> - <inlinegraphic fileref="html/time-editor.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="time-editor.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonTimePicker"> - <inlinegraphic fileref="html/time-picker.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="time-picker.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonVVolumebar"> - <inlinegraphic fileref="html/vvolumebar.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="vvolumebar.png" format="PNG"></inlinegraphic> </link> <link linkend="HildonWeekdayPicker"> - <inlinegraphic fileref="html/weekday-picker.png" format="PNG"></inlinegraphic> + <inlinegraphic fileref="weekday-picker.png" format="PNG"></inlinegraphic> </link> </para>
- Previous message: [maemo-commits] r10668 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r10670 - projects/haf/branches/hildon-libs/hildon-1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]