sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Fix generation of the documentation Makefiles

Browse source 
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.
This commit is contained in:
Damien Lespiau 2011-05-18 14:14:28 +01:00
parent 57db73873e
commit 97abcda1a2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/reference/cogl-2.0/Makefile.am
View file

@ -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

4
doc/reference/cogl/Makefile.am
View file

@ -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