[cogl] doc: Fix EXTRA_DIST variable setup

[Robert Bragg <rbragg src gnome org>]

commit 0e5df1776109c1c532f3959ba8882161b5192c8f
Author: Robert Bragg <robert linux intel com>
Date:   Tue Jun 14 16:07:43 2011 +0100

    doc: Fix EXTRA_DIST variable setup
    
    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.

 doc/reference/cogl-2.0-experimental/Makefile.am |   10 +++-------
 doc/reference/cogl/Makefile.am                  |   10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am
index 51a1b8b..c432cb8 100644
--- a/doc/reference/cogl-2.0-experimental/Makefile.am
+++ b/doc/reference/cogl-2.0-experimental/Makefile.am
@@ -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)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
-EXTRA_DIST =
 if BUILD_GTK_DOC
 include $(top_srcdir)/gtk-doc.make
+else
+EXTRA_DIST =
 endif
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 
-EXTRA_DIST += \
-	fill-rule-non-zero.png \
-	fill-rule-even-odd.png \
-	quad-indices-triangles.png \
-	quad-indices-order.png \
-	cogl_ortho.png
+EXTRA_DIST += $(HTML_IMAGES) $(content_files)
diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
index 66550cc..ef416e4 100644
--- a/doc/reference/cogl/Makefile.am
+++ b/doc/reference/cogl/Makefile.am
@@ -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)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
-EXTRA_DIST =
 if BUILD_GTK_DOC
 include $(top_srcdir)/gtk-doc.make
+else
+EXTRA_DIST =
 endif
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 
-EXTRA_DIST += \
-	fill-rule-non-zero.png \
-	fill-rule-even-odd.png \
-	quad-indices-triangles.png \
-	quad-indices-order.png \
-	cogl_ortho.png
+EXTRA_DIST += $(HTML_IMAGES) $(content_files)