diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2011-05-18 14:14:28 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2011-05-18 14:14:28 +0100 |
| commit | 97abcda1a2771df13228da92dc6b975088d86bd6 (patch) | |
| tree | ac7c7e6b416b1f97579db6b9380079627a7c56de | |
| parent | 57db73873eb210f4ec51ae71852f533bc5640e68 (diff) | |
| download | cogl-97abcda1a2771df13228da92dc6b975088d86bd6.tar.gz | |
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.
| -rw-r--r-- | doc/reference/cogl-2.0/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 9e61c2f7..51a1b8b3 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 614494fc..66550cce 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 |