Documentation updates

[hildon] / doc / gtk-doc.make

diff --git a/doc/gtk-doc.make b/doc/gtk-doc.make
index eaa2be2..4f94267 100644 (file)
--- a/doc/gtk-doc.make
+++ b/doc/gtk-doc.make
@@ -42,11 +42,6 @@ CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
 all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
 
 #### scan ####
 
@@ -65,7 +60,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
        touch scan-build.stamp
 
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+$(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(SCANOBJ_FILES): scan-build.stamp
        @true
 
 #### templates ####
@@ -80,8 +75,9 @@ tmpl.stamp: tmpl-build.stamp
        @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) && \
@@ -103,6 +99,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @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
 
 ##############
 
@@ -111,7 +110,7 @@ clean-local:
        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/*`; \
@@ -152,4 +151,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
          cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
        fi
 
-.PHONY : dist-hook-local docs
+.PHONY : dist-hook-local