diff options
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | docs/gudev/Makefile.am | 6 | ||||
| -rw-r--r-- | docs/libudev/Makefile.am | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh index e3407457b0..e5bbcdfac7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,8 +6,8 @@ if type -p gtkdocize > /dev/null; then gtkdocize --docdir docs gtkdocargs=--enable-gtk-doc fi - -aclocal && \ + +aclocal -I m4 && \ autoheader && \ autoconf && \ libtoolize --copy && \ diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am index 57334b6ddc..e0039e7606 100644 --- a/docs/gudev/Makefile.am +++ b/docs/gudev/Makefile.am @@ -94,8 +94,11 @@ GTKDOC_LIBS = \ $(GLIB_LIBS) \ $(top_builddir)/libgudev-1.0.la +if ENABLE_GTK_DOC +EXTRA_DIST= + # This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/docs/gtk-doc.make +-include $(top_srcdir)/docs/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in @@ -107,7 +110,6 @@ EXTRA_DIST += version.xml.in #DISTCLEANFILES += # Comment this out if you want your docs-status tested during 'make check' -if ENABLE_GTK_DOC TESTS_ENVIRONMENT = cd $(top_srcdir) TESTS = $(GTKDOC_CHECK) endif diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am index c6d7b8ca25..7899bd1145 100644 --- a/docs/libudev/Makefile.am +++ b/docs/libudev/Makefile.am @@ -88,8 +88,11 @@ override LDFLAGS= GTKDOC_CFLAGS= GTKDOC_LIBS= +if ENABLE_GTK_DOC +EXTRA_DIST= + # This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/docs/gtk-doc.make +-include $(top_srcdir)/docs/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in @@ -101,7 +104,6 @@ EXTRA_DIST += version.xml.in #DISTCLEANFILES += # Comment this out if you want your docs-status tested during 'make check' -if ENABLE_GTK_DOC TESTS_ENVIRONMENT = cd $(top_srcdir) TESTS = $(GTKDOC_CHECK) endif |