brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Fix EXTRA_DIST variable setup

Browse Source 
Since gtk-doc is an optional dependency for Cogl then we need to special
case how EXTRA_DIST is initialized. It shouldn't be set when using
gtk-doc since gtk-doc.make expects to initialize EXTRA_DIST.  If we
aren't using gtk-doc then it should be initialized to an empty value
instead of including gtk-doc.make so that the later lines that append
various extra png files to EXTRA_DIST won't fail.
This commit is contained in:
Robert Bragg 2011-06-14 16:07:43 +01:00
parent 57d76e315f
commit 0e5df17761
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/reference/cogl-2.0-experimental/Makefile.am
View File

@ -142,17 +142,13 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $
GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize. # This includes the standard gtk-doc make rules, copied by gtkdocize.
EXTRA_DIST =
if BUILD_GTK_DOC if BUILD_GTK_DOC
include $(top_srcdir)/gtk-doc.make include $(top_srcdir)/gtk-doc.make
else
EXTRA_DIST =
endif endif
# Other files to distribute # Other files to distribute
# e.g. EXTRA_DIST += version.xml.in # e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += \ EXTRA_DIST += $(HTML_IMAGES) $(content_files)
fill-rule-non-zero.png \
fill-rule-even-odd.png \
quad-indices-triangles.png \
quad-indices-order.png \
cogl_ortho.png

10
doc/reference/cogl/Makefile.am
View File

@ -139,17 +139,13 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $
GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize. # This includes the standard gtk-doc make rules, copied by gtkdocize.
EXTRA_DIST =
if BUILD_GTK_DOC if BUILD_GTK_DOC
include $(top_srcdir)/gtk-doc.make include $(top_srcdir)/gtk-doc.make
else
EXTRA_DIST =
endif endif
# Other files to distribute # Other files to distribute
# e.g. EXTRA_DIST += version.xml.in # e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += \ EXTRA_DIST += $(HTML_IMAGES) $(content_files)
fill-rule-non-zero.png \
fill-rule-even-odd.png \
quad-indices-triangles.png \
quad-indices-order.png \
cogl_ortho.png