From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 Jul 2011 12:22:36 +0000 (+0200)
Subject: build-sys: fix gtk-doc distclean
X-Git-Tag: v2.20-rc1~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fe1b06aba1e7cbb0e13e4bca83e9838a3727eed;p=thirdparty%2Futil-linux.git

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 9d34d5131e..b6224cc1e4 100644
--- 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 eb84f79057..b8c8f4094d 100644
--- 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 fe0545a968..0f6ab95bb4 100644
--- 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