[cogl] build: Fix generation of the documentation Makefiles
- From: Damien Lespiau <dlespiau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] build: Fix generation of the documentation Makefiles
- Date: Wed, 18 May 2011 13:23:40 +0000 (UTC)
commit 97abcda1a2771df13228da92dc6b975088d86bd6
Author: Damien Lespiau <damien lespiau intel com>
Date: Wed May 18 14:14:28 2011 +0100
build: Fix generation of the documentation Makefiles
Automake seems a bit fragile when trying to do cunning things like
including a file with "-include". It does not recurse into that file (if
it exists) to generate the final Makefiles.
Let's add a if BUILD_GTK_DOC guard around the gtk-doc.make inclusion
instead, hopefully should work as intended.
doc/reference/cogl-2.0/Makefile.am | 4 +++-
doc/reference/cogl/Makefile.am | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/doc/reference/cogl-2.0/Makefile.am b/doc/reference/cogl-2.0/Makefile.am
index 9e61c2f..51a1b8b 100644
--- a/doc/reference/cogl-2.0/Makefile.am
+++ b/doc/reference/cogl-2.0/Makefile.am
@@ -143,7 +143,9 @@ GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
EXTRA_DIST =
--include $(top_srcdir)/gtk-doc.make
+if BUILD_GTK_DOC
+include $(top_srcdir)/gtk-doc.make
+endif
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
index 614494f..66550cc 100644
--- a/doc/reference/cogl/Makefile.am
+++ b/doc/reference/cogl/Makefile.am
@@ -140,7 +140,9 @@ GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
EXTRA_DIST =
--include $(top_srcdir)/gtk-doc.make
+if BUILD_GTK_DOC
+include $(top_srcdir)/gtk-doc.make
+endif
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]