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

3 files changed, 26 insertions, 16 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 39a603c34..719f9e597 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-22  Stefan Kost  <ensonic@users.sf.net>
+
+	* glib/Makefile.am:
+	* gobject/Makefile.am:
+	  Unify the Makefiles. In glib only scan glib folders.
+
 2008-06-16  Ross Burton  <ross@burtonini.com>
 
 	* gio/gio-sections.txt:
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 69da894d5..acf90c369 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
+#include $(top_srcdir)/Makefile.decl
+
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
@@ -8,11 +9,14 @@ DOC_MODULE=glib
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=glib-docs.sgml
 
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../glib ../../../gmodule
+
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../..
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
@@ -43,9 +47,6 @@ IGNORE_HFILES=			\
 	pcre			\
 	update-pcre
 
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml 
-
 # Images to copy into HTML directory
 HTML_IMAGES =  				\
 	file-name-encodings.png		\
@@ -82,7 +83,7 @@ EXTRA_DIST +=				\
 
 ########################################################################
 
-man_MANS =		  	\ 
+man_MANS =		  	\
 	glib-gettextize.1 	\
 	gtester.1		\
 	gtester-report.1
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index f981e64f1..b3df01fd7 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/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
 
+# 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 \
+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-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