Unify the Makefiles. In glib only scan glib folders.

* glib/Makefile.am:
	* gobject/Makefile.am:
	  Unify the Makefiles. In glib only scan glib folders.


svn path=/trunk/; revision=7094

docs/reference/gobject/Makefile.am

@@ -2,19 +2,25 @@
 # we have no tests here
 #include $(top_srcdir)/Makefile.decl
 
+AUTOMAKE_OPTIONS = 1.6
+
 # The name of the module.
 DOC_MODULE=gobject
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gobject-docs.sgml
 
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards=G_DISABLE_DEPRECATED \
-	--ignore-decorators=G_GNUC_INTERNAL
-
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gobject
 
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
+	--ignore-decorators=G_GNUC_INTERNAL
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gobject/*.h
 CFILE_GLOB=$(top_srcdir)/gobject/*.c
 
@@ -34,8 +40,9 @@ GTKDOC_LIBS = \
 	$(top_builddir)/glib/libglib-2.0.la	\
 	$(top_builddir)/gobject/libgobject-2.0.la
 
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode
+# Images to copy into HTML directory
+HTML_IMAGES =  \
+	$(srcdir)/images/glue.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files = version.xml 		\
@@ -49,10 +56,6 @@ content_files = version.xml 		\
 		tut_intro.xml \
 		tut_tools.xml
 
-# Images to copy into HTML directory
-HTML_IMAGES =  \
-	$(srcdir)/images/glue.png
-
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html