From 8d4a6f4d4c9db2b3dfcb8460cd7a318d812ab6a4 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri, 6 May 2011 17:59:00 +0100
Subject: [PATCH] build: Enable building the documentation again

At least the 1.6.0 documentation. The 2.0 one has been missed by the
filter-branch and will be re-added later.
---
 Makefile.am                         |  2 +-
 configure.ac                        |  7 ++++++-
 doc/Makefile.am                     |  7 +++++++
 doc/reference/Makefile.am           |  1 +
 doc/reference/cogl/Makefile.am      | 12 ++++++------
 doc/reference/cogl/cogl-docs.xml.in |  2 +-
 6 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 doc/Makefile.am
 create mode 100644 doc/reference/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 690f2eda6..af075fb11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cogl examples po
+SUBDIRS = cogl examples doc po
 
 if BUILD_COGL_PANGO
 SUBDIRS += cogl-pango
diff --git a/configure.ac b/configure.ac
index d6bb438ee..e7c63f359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,7 +647,7 @@ dnl ================================================================
 dnl Documentation stuff.
 dnl ================================================================
 GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl])
-
+AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"])
 
 dnl ================================================================
 dnl Check for dependency packages.
@@ -737,6 +737,10 @@ cogl/cogl-defines.h
 cogl-pango/Makefile
 cogl-pango/cogl-pango-1.0.pc
 cogl-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:cogl-pango/cogl-pango.pc.in
+doc/Makefile
+doc/reference/Makefile
+doc/reference/cogl/Makefile
+doc/reference/cogl/cogl-docs.xml
 examples/Makefile
 po/Makefile.in
 )
@@ -773,6 +777,7 @@ echo "        Linker flags: ${LDFLAGS} ${COGL_EXTRA_LDFLAGS}"
 # Miscellaneous
 echo ""
 echo " • Extra:"
+echo "        Build API reference: ${enable_gtk_doc}"
 echo "        Build introspection data: ${enable_introspection}"
 
 echo ""
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 000000000..18bfc13a8
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =
+
+if BUILD_GTK_DOC
+SUBDIRS += reference
+endif
+
+DIST_SUBDIRS = reference
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
new file mode 100644
index 000000000..e13c1b481
--- /dev/null
+++ b/doc/reference/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cogl
diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
index 01bc8e9ce..05be7ad44 100644
--- a/doc/reference/cogl/Makefile.am
+++ b/doc/reference/cogl/Makefile.am
@@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../clutter/cogl/cogl
+DOC_SOURCE_DIR=../../../cogl
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
@@ -45,9 +45,9 @@ FIXXREF_OPTIONS=\
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=\
-	$(top_srcdir)/clutter/cogl/cogl/*.h \
-	$(top_builddir)/clutter/cogl/cogl/*.h
-CFILE_GLOB=$(top_srcdir)/clutter/cogl/cogl/*.c
+	$(top_srcdir)/cogl/*.h \
+	$(top_builddir)/cogl/*.h
+CFILE_GLOB=$(top_srcdir)/cogl/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -134,8 +134,8 @@ expand_content_files = \
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl -I$(top_builddir)/clutter/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(CLUTTER_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS)
+INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS)
+GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/reference/cogl/cogl-docs.xml.in b/doc/reference/cogl/cogl-docs.xml.in
index c6f29428e..a2a315933 100644
--- a/doc/reference/cogl/cogl-docs.xml.in
+++ b/doc/reference/cogl/cogl-docs.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version "@VERSION@">
+<!ENTITY version "@COGL_1_VERSION@">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">