build-sys: fix gtk-doc distclean

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/config/gtk-doc.make b/config/gtk-doc.make
index 9d34d5131e6cd23d02f29b86aea7bad4a964ae4d..b6224cc1e45c45609cd18a5bc6dace86b2300d5d 100644 (file)
--- a/config/gtk-doc.make
+++ b/config/gtk-doc.make
@@ -34,6 +34,8 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(docdir)/$(DOC_MODULE)
 
+DISTCLEANFILES =
+
 EXTRA_DIST =                           \
        $(content_files)                \
        $(HTML_IMAGES)                  \
@@ -50,7 +52,8 @@ SCANOBJ_FILES =                \
        $(DOC_MODULE).hierarchy  \
        $(DOC_MODULE).interfaces \
        $(DOC_MODULE).prerequisites \
-       $(DOC_MODULE).signals
+       $(DOC_MODULE).signals    \
+        $(DOC_MODULE).types            # util-linux: we don't use types
 
 REPORT_FILES = \
        $(DOC_MODULE)-undocumented.txt \
@@ -181,7 +184,7 @@ distclean-local:
               $(DOC_MODULE)-overrides.txt \
               $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
        test $(abs_builddir) ==  $(abs_srcdir) || \
-              rm -f $(DOC_MODULE)-sections.txt
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
 
 install-data-local:
        installfiles=`echo $(builddir)/html/*`; \

diff --git a/libblkid/docs/Makefile.am b/libblkid/docs/Makefile.am
index eb84f7905764ea3d69a203ee78e80b8d531c1528..b8c8f4094dff84a88dca14d9515d1255e9891415 100644 (file)
--- a/libblkid/docs/Makefile.am
+++ b/libblkid/docs/Makefile.am
@@ -87,12 +87,12 @@ include $(top_srcdir)/config/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in $(srcdir)/libblkid-config.xml
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
+DISTCLEANFILES += version.xml
 
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC

diff --git a/libmount/docs/Makefile.am b/libmount/docs/Makefile.am
index fe0545a9688ea435b99182d3513c45b32012a962..0f6ab95bb401681a14886a56ae1ad98ed1ff3533 100644 (file)
--- a/libmount/docs/Makefile.am
+++ b/libmount/docs/Makefile.am
@@ -92,7 +92,7 @@ EXTRA_DIST += version.xml.in
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
+DISTCLEANFILES += version.xml
 
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC