diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-18 09:38:09 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-18 09:38:09 -0500 |
| commit | fb71ce410efe546f80ceb3e5144b6d75558efb57 (patch) | |
| tree | a96f2fb9c31678b5a0bbbfbacb89c68236fc15d2 | |
| parent | 814a7243680857496595c21a05b8bb6242664d8e (diff) | |
| parent | 8b75afdbc2c0302da3110fbc2b33bc896c39a66e (diff) | |
Fix gtk-doc build
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | docs/gudev/Makefile.am | 9 | ||||
| -rw-r--r-- | docs/libudev/Makefile.am | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 5939c03237..f7cb506dd2 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,5 @@ m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 -docs/gtk-doc.make m4/gtk-doc.m4 +docs/gtk-doc.make diff --git a/autogen.sh b/autogen.sh index f4ff2019d4..26f4160c52 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,10 @@ #!/bin/sh -type -p gtkdocize > /dev/null && gtkdocize --docdir docs +if type -p gtkdocize > /dev/null; then + gtkdocize --docdir docs +else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + echo 'AC_DEFUN([GTK_DOC_CHECK], [AM_CONDITIONAL([ENABLE_GTK_DOC], [FALSE])])' > m4/gtk-doc.m4 +fi autoreconf -f -i diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am index 848ad6a4a0..3fba8ea479 100644 --- a/docs/gudev/Makefile.am +++ b/docs/gudev/Makefile.am @@ -92,13 +92,11 @@ GTKDOC_CFLAGS = \ GTKDOC_LIBS = \ $(GLIB_LIBS) \ - $(top_builddir)/libgudev-1.0.la - -if ENABLE_GTK_DOC -EXTRA_DIST= + $(top_builddir)/src/gudev/libgudev-1.0.la \ + $(top_builddir)/src/udev/libudev-core.la # 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 @@ -110,6 +108,7 @@ 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 7899bd1145..c6d7b8ca25 100644 --- a/docs/libudev/Makefile.am +++ b/docs/libudev/Makefile.am @@ -88,11 +88,8 @@ 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 @@ -104,6 +101,7 @@ 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 |