gtk-doc/: Fix make clean when gtk-doc is disabled and other cleanups.

Original commit message from CVS:
* gtk-doc-plugins.mak:
* gtk-doc.mak:
Fix make clean when gtk-doc is disabled and other cleanups.

diff --git a/ChangeLog b/ChangeLog
index fef35ed..85d8449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-21  Felipe Contreras  <felipe.contreras@gmail.com>
+
+       * gtk-doc-plugins.mak:
+       * gtk-doc.mak:
+       Fix make clean when gtk-doc is disabled and other cleanups.
+
 2008-05-17  Jan Schmidt  <jan.schmidt@sun.com>
 
        * gtk-doc-plugins.mak:

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index ccce744..a6d5324 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -250,24 +250,21 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '-- Fixing Crossreferences' 
        gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
        touch html-build.stamp
+
+clean-local-gtkdoc:
+       rm -rf xml tmpl html
+# clean files copied for nonsrcdir templates build
+       if test x"$(srcdir)" != x. ; then \
+           rm -rf $(SCANOBJ_FILES) $(SCAN_FILES); \
+       fi
 else
 all-local:
+clean-local-gtkdoc:
 endif
 
-# FIXME: these rules need a little cleaning up
-clean-local:
+clean-local: clean-local-gtkdoc
        rm -f *~ *.bak
        rm -rf .libs
-# clean files generated for tmpl build
-       -rm -rf tmpl
-# clean files copied/generated for nonsrcdir tmpl build
-       if test x"$(srcdir)" != x. ; then \
-           rm -rf $(SCANOBJ_FILES) $(SCAN_FILES);                      \
-       fi
-# clean files generated for xml build
-       -rm -rf xml
-# clean files generate for html build
-       -rm -rf html
 
 distclean-local: clean
        rm -rf tmpl/*.sgml.bak

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 1c9ece1..f75e794 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -141,13 +141,20 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '-- Fixing Crossreferences' 
        gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
        touch html-build.stamp
+
+clean-local-gtkdoc:
+       rm -rf xml tmpl html
+# clean files copied for nonsrcdir templates build
+       if test x"$(srcdir)" != x. ; then \
+               rm -rf $(DOC_MODULE).types; \
+       fi
 else
 all-local:
+clean-local-gtkdoc:
 endif
 
-clean-local:
+clean-local: clean-local-gtkdoc
        rm -f *~ *.bak
-       rm -rf xml html
        rm -rf .libs
 
 maintainer-clean-local: clean