build-sys: enable libmount and libblkid docs

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

6 files changed, 14 insertions, 22 deletions

diff --git a/config/gtk-doc.make b/config/gtk-doc.make
index b6224cc1e..86566ea1c 100644
--- a/config/gtk-doc.make
+++ b/config/gtk-doc.make
@@ -72,7 +72,6 @@ docs: html-build.stamp
 
 $(REPORT_FILES): sgml-build.stamp
 
-
 #### setup ####
 
 setup-build.stamp:
diff --git a/configure.ac b/configure.ac
index 4e463549d..37d5fa4c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1296,8 +1296,10 @@ AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 Makefile
 libblkid/blkid.pc
+libblkid/docs/Makefile
 libblkid/docs/version.xml
 libblkid/src/blkid.h
+libmount/docs/Makefile
 libmount/docs/version.xml
 libmount/mount.pc
 libmount/src/libmount.h
diff --git a/libblkid/Makemodule.am b/libblkid/Makemodule.am
index ff77dcd0c..ca5448b6c 100644
--- a/libblkid/Makemodule.am
+++ b/libblkid/Makemodule.am
@@ -3,7 +3,10 @@ if BUILD_LIBBLKID
 include libblkid/src/Makemodule.am
 include libblkid/samples/Makemodule.am
 
-#include libblkid/docs/Makemodule.am
+if ENABLE_GTK_DOC
+# Docs uses separate Makefiles
+SUBDIRS += libblkid/docs
+endif
 
 pkgconfig_DATA += libblkid/blkid.pc
 dist_man_MANS  += libblkid/libblkid.3
diff --git a/libblkid/docs/Makefile.am b/libblkid/docs/Makefile.am
index b8c8f4094..d06038ef0 100644
--- a/libblkid/docs/Makefile.am
+++ b/libblkid/docs/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/config/include-Makefile.am
-
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.10 at least.
@@ -50,8 +48,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(ul_libblkid_incdir)/blkid.h
-CFILE_GLOB=$(ul_libblkid_srcdir)/*.c
+HFILE_GLOB=$(top_builddir)/libblkid/src/blkid.h
+CFILE_GLOB=$(top_srcdir)/libblkid/src/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -94,8 +92,3 @@ EXTRA_DIST += version.xml.in $(srcdir)/libblkid-config.xml
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES += version.xml
 
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
-endif
diff --git a/libmount/Makemodule.am b/libmount/Makemodule.am
index 188208f91..ffeee5cd3 100644
--- a/libmount/Makemodule.am
+++ b/libmount/Makemodule.am
@@ -2,7 +2,10 @@ if BUILD_LIBMOUNT
 
 include libmount/src/Makemodule.am
 
-#include libmount/docs/Makemodule.am
+if ENABLE_GTK_DOC
+# Docs uses separate Makefiles
+SUBDIRS += libmount/docs
+endif
 
 pkgconfig_DATA += libmount/mount.pc
 EXTRA_DIST     += libmount/mount.pc.in
diff --git a/libmount/docs/Makefile.am b/libmount/docs/Makefile.am
index 0f6ab95bb..2c0363f37 100644
--- a/libmount/docs/Makefile.am
+++ b/libmount/docs/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/config/include-Makefile.am
-
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.10 at least.
@@ -50,8 +48,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(ul_libmount_incdir)/libmount.h
-CFILE_GLOB=$(ul_libmount_srcdir)/*.c
+HFILE_GLOB=$(top_builddir)/libmount/src/libmount.h
+CFILE_GLOB=$(top_srcdir)/libmount/src/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -93,9 +91,3 @@ EXTRA_DIST += version.xml.in
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES += version.xml
-
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
-endif