Move reference down one level in the build

There's no point in having the reference in its separate directory, as
we don't ship any other documentation.

8 files changed, 103 insertions, 105 deletions

diff --git a/.gitignore b/.gitignore
index 3218f54..373a022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,23 +20,23 @@ config.status
 config.sub
 configure
 depcomp
-/doc/reference/*.stamp
-/doc/reference/clutter-gtk-*-decl-list.txt
-/doc/reference/clutter-gtk-*-decl.txt
-/doc/reference/clutter-gtk-*-overrides.txt
-/doc/reference/clutter-gtk-*-undeclared.txt
-/doc/reference/clutter-gtk-*-undocumented.txt
-/doc/reference/clutter-gtk-*-unused.txt
-/doc/reference/clutter-gtk-*.args
-/doc/reference/clutter-gtk-*.hierarchy
-/doc/reference/clutter-gtk-*.interfaces
-/doc/reference/clutter-gtk-*.prerequisites
-/doc/reference/clutter-gtk-*.signals
-/doc/reference/html/
-/doc/reference/tmpl/
-/doc/reference/version.xml
-/doc/reference/xml/
-/doc/reference/*.bak
+/doc/*.stamp
+/doc/clutter-gtk-*-decl-list.txt
+/doc/clutter-gtk-*-decl.txt
+/doc/clutter-gtk-*-overrides.txt
+/doc/clutter-gtk-*-undeclared.txt
+/doc/clutter-gtk-*-undocumented.txt
+/doc/clutter-gtk-*-unused.txt
+/doc/clutter-gtk-*.args
+/doc/clutter-gtk-*.hierarchy
+/doc/clutter-gtk-*.interfaces
+/doc/clutter-gtk-*.prerequisites
+/doc/clutter-gtk-*.signals
+/doc/html/
+/doc/tmpl/
+/doc/version.xml
+/doc/xml/
+/doc/*.bak
 /examples/*.o
 /examples/gtk-clutter-events
 /examples/gtk-clutter-multistage
diff --git a/configure.ac b/configure.ac
index 5c90661..b8dd3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,7 @@ AC_CONFIG_FILES([
         clutter-gtk/gtk-clutter-version.h
         
         doc/Makefile
-        doc/reference/Makefile
-        doc/reference/version.xml
+        doc/version.xml
 
         examples/Makefile
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f3ddc22..92125bf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,85 @@
-SUBDIRS = reference
+## Process this file with automake to produce Makefile.in
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=clutter-gtk-$(CLUTTER_GTK_API_VERSION)
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
+
+# The directory containing the source code. Relative to $(srcdir).
+# 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=$(top_srcdir)/clutter-gtk $(top_builddir)/clutter-gtk
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS=--type-init-func="clutter_base_init()"
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=gtk_clutter
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS=
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=\
+	--extra-dir=$(G_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(G_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GDK_PREFIX)/share/gtk-doc/html/gdk \
+	--extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gtk \
+	--extra-dir=$(GDK_PIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf \
+	--extra-dir=$(CLUTTER_PREFIX)/share/gtk-doc/html/clutter
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=$(top_srcdir)/clutter-gtk/*.h $(top_builddir)/clutter-gtk/*.h
+CFILE_GLOB=$(top_srcdir)/clutter-gtk/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES=\
+	gtk-clutter-actor-private.h \
+	gtk-clutter-offscreen.h \
+	clutter-gtk.h
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files=version.xml
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+
+AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/clutter-gtk $(CLUTTER_GTK_DEPS_CFLAGS)
+GTKDOC_LIBS=$(top_builddir)/clutter-gtk/libclutter-gtk-$(CLUTTER_GTK_API_VERSION).la $(CLUTTER_GTK_DEPS_LIBS)
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in
diff --git a/doc/reference/clutter-gtk-1.0-docs.xml b/doc/clutter-gtk-1.0-docs.xml
index 76c5d7a..76c5d7a 100644
--- a/doc/reference/clutter-gtk-1.0-docs.xml
+++ b/doc/clutter-gtk-1.0-docs.xml
diff --git a/doc/reference/clutter-gtk-1.0-sections.txt b/doc/clutter-gtk-1.0-sections.txt
index f5f85c1..f5f85c1 100644
--- a/doc/reference/clutter-gtk-1.0-sections.txt
+++ b/doc/clutter-gtk-1.0-sections.txt
diff --git a/doc/reference/clutter-gtk-1.0.types b/doc/clutter-gtk-1.0.types
index 5314587..5314587 100644
--- a/doc/reference/clutter-gtk-1.0.types
+++ b/doc/clutter-gtk-1.0.types
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
deleted file mode 100644
index 92125bf..0000000
--- a/doc/reference/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=clutter-gtk-$(CLUTTER_GTK_API_VERSION)
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
-
-# The directory containing the source code. Relative to $(srcdir).
-# 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=$(top_srcdir)/clutter-gtk $(top_builddir)/clutter-gtk
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="clutter_base_init()"
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=gtk_clutter
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=\
-	--extra-dir=$(G_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(G_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GDK_PREFIX)/share/gtk-doc/html/gdk \
-	--extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gtk \
-	--extra-dir=$(GDK_PIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf \
-	--extra-dir=$(CLUTTER_PREFIX)/share/gtk-doc/html/clutter
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/clutter-gtk/*.h $(top_builddir)/clutter-gtk/*.h
-CFILE_GLOB=$(top_srcdir)/clutter-gtk/*.c
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=\
-	gtk-clutter-actor-private.h \
-	gtk-clutter-offscreen.h \
-	clutter-gtk.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/clutter-gtk $(CLUTTER_GTK_DEPS_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/clutter-gtk/libclutter-gtk-$(CLUTTER_GTK_API_VERSION).la $(CLUTTER_GTK_DEPS_LIBS)
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
diff --git a/doc/reference/version.xml.in b/doc/version.xml.in
index 27323da..27323da 100644
--- a/doc/reference/version.xml.in
+++ b/doc/version.xml.in