Bring back the giomm reference documentation

* glib/{src,glibmm}/filelist.am: Add namespace prefix glibmm_
to variable names, so that the file lists of glibmm and giomm
can be included together without conflicts.
* gio/{src,giomm}/filelist.am: Add namespace prefix giomm_ to
variable names.
* glib/{src,glibmm}/Makefile.am: Copy the namespace-prefixed
make variables to non-prefixed variables, so that the Automake
include files from mm-common will pick up the values.
* gio/{src,giomm}/Makefile.am: ditto.
* docs/Makefile.am: Include file lists of giomm.
(doc_input): List the header files of both glibmm and giomm.

10 files changed, 75 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b110bddf..3520f75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2009-08-09  Daniel Elstner  <danielk@openismus.com>
 
+	Bring back the giomm reference documentation
+
+	* glib/{src,glibmm}/filelist.am: Add namespace prefix glibmm_
+	to variable names, so that the file lists of glibmm and giomm
+	can be included together without conflicts.
+	* gio/{src,giomm}/filelist.am: Add namespace prefix giomm_ to
+	variable names.
+	* glib/{src,glibmm}/Makefile.am: Copy the namespace-prefixed
+	make variables to non-prefixed variables, so that the Automake
+	include files from mm-common will pick up the values.
+	* gio/{src,giomm}/Makefile.am: ditto.
+	* docs/Makefile.am: Include file lists of giomm.
+	(doc_input): List the header files of both glibmm and giomm.
+
+2009-08-09  Daniel Elstner  <danielk@openismus.com>
+
 	Begin move to new documentation infrastructure
 
 	* configure.ac (AC_CONFIG_FILES): Remove the old build files
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 46d5d1a7..eeaa4ffa 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -17,9 +17,15 @@
 
 include $(top_srcdir)/glib/src/filelist.am
 include $(top_srcdir)/glib/glibmm/filelist.am
+include $(top_srcdir)/gio/src/filelist.am
+include $(top_srcdir)/gio/giomm/filelist.am
+
+glibmm_files_h = $(glibmm_files_built_h) $(glibmm_files_extra_h)
+giomm_files_h  = $(giomm_files_built_h) $(giomm_files_extra_h)
 
 book_name = $(GLIBMM_MODULE_NAME)
-doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(files_built_h))
+doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \
+            $(addprefix $(top_srcdir)/gio/giomm/,$(giomm_files_h))
 
 # Override utility locations to point to the local files.
 doc_install         = $(PERL) -- $(srcdir)/doc-install.pl
diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am
index 9b0f52fd..7af85c0e 100644
--- a/gio/giomm/Makefile.am
+++ b/gio/giomm/Makefile.am
@@ -19,6 +19,14 @@ lib_LTLIBRARIES = libgiomm-2.4.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
+
+files_built_cc = $(giomm_files_built_cc)
+files_built_h  = $(giomm_files_built_h)
+files_built_ph = $(giomm_files_built_ph)
+files_extra_cc = $(giomm_files_extra_cc)
+files_extra_h  = $(giomm_files_extra_h)
+files_extra_ph = $(giomm_files_extra_ph)
+
 include $(top_srcdir)/build/compile-binding.am
 
 dist_noinst_HEADERS = slot_async.h
diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am
index 3c79eaa1..541947de 100644
--- a/gio/giomm/filelist.am
+++ b/gio/giomm/filelist.am
@@ -1,8 +1,10 @@
 ## This file is part of glibmm.
 
-files_built_cc = $(files_any_hg:.hg=.cc) $(files_arch_hg:.hg=.cc) wrap_init.cc
-files_built_h  = $(files_any_hg:.hg=.h) $(files_arch_hg:.hg=.h)
-files_built_ph = $(files_any_hg:%.hg=private/%_p.h) $(files_arch_hg:%.hg=private/%_p.h)
+giomm_files_built_cc = $(giomm_files_any_hg:.hg=.cc) $(giomm_files_arch_hg:.hg=.cc) wrap_init.cc
+giomm_files_built_h  = $(giomm_files_any_hg:.hg=.h) $(giomm_files_arch_hg:.hg=.h)
+giomm_files_built_ph = $(giomm_files_any_hg:%.hg=private/%_p.h)	\
+                       $(giomm_files_arch_hg:%.hg=private/%_p.h)
 
-files_extra_cc = contenttype.cc init.cc slot_async.cc
-files_extra_h  = contenttype.h init.h
+giomm_files_extra_cc = contenttype.cc init.cc slot_async.cc
+giomm_files_extra_h  = contenttype.h init.h
+giomm_files_extra_ph =
diff --git a/gio/src/Makefile.am b/gio/src/Makefile.am
index e281d4e6..469c22b7 100644
--- a/gio/src/Makefile.am
+++ b/gio/src/Makefile.am
@@ -25,4 +25,9 @@ codegen_srcdir  = $(top_srcdir)/tools
 
 include $(srcdir)/filelist.am
 include $(top_srcdir)/tools/m4/filelist.am
+
+files_defs = $(giomm_files_defs)
+files_ccg  = $(giomm_files_ccg)
+files_hg   = $(giomm_files_hg)
+
 include $(top_srcdir)/build/generate-binding.am
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index 0d35fb40..f07b3164 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -1,6 +1,6 @@
 ## This file is part of glibmm.
 
-files_defs =				\
+giomm_files_defs =			\
 	gio.defs			\
 	gio_enums.defs			\
 	gio_methods.defs		\
@@ -10,7 +10,7 @@ files_defs =				\
 	gio_docs.xml			\
 	gio_docs_override.xml
 
-files_any_hg =				\
+giomm_files_any_hg =			\
 	appinfo.hg			\
 	asyncresult.hg			\
 	bufferedinputstream.hg		\
@@ -61,16 +61,16 @@ files_any_hg =				\
 	volume.hg			\
 	volumemonitor.hg
 
-files_posix_hg =			\
+giomm_files_posix_hg =			\
 	desktopappinfo.hg		\
 	unixinputstream.hg		\
 	unixoutputstream.hg
 
 if OS_WIN32
-files_arch_hg =
+giomm_files_arch_hg =
 else
-files_arch_hg = $(files_posix_hg)
+giomm_files_arch_hg = $(giomm_files_posix_hg)
 endif
 
-files_hg  = $(files_any_hg) $(files_posix_hg)
-files_ccg = $(files_hg:.hg=.ccg)
+giomm_files_hg  = $(giomm_files_any_hg) $(giomm_files_posix_hg)
+giomm_files_ccg = $(giomm_files_hg:.hg=.ccg)
diff --git a/glib/glibmm/Makefile.am b/glib/glibmm/Makefile.am
index 8aea19f5..5cdf11f8 100644
--- a/glib/glibmm/Makefile.am
+++ b/glib/glibmm/Makefile.am
@@ -19,6 +19,14 @@ lib_LTLIBRARIES = libglibmm-2.4.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
+
+files_built_cc = $(glibmm_files_built_cc)
+files_built_h  = $(glibmm_files_built_h)
+files_built_ph = $(glibmm_files_built_ph)
+files_extra_cc = $(glibmm_files_extra_cc)
+files_extra_h  = $(glibmm_files_extra_h)
+files_extra_ph = $(glibmm_files_extra_ph)
+
 include $(top_srcdir)/build/compile-binding.am
 
 AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(GLIBMM_CFLAGS)
diff --git a/glib/glibmm/filelist.am b/glib/glibmm/filelist.am
index eca250b7..74d3cf02 100644
--- a/glib/glibmm/filelist.am
+++ b/glib/glibmm/filelist.am
@@ -1,10 +1,10 @@
 ## This file is part of glibmm.
 
-files_built_cc = $(files_hg:.hg=.cc) $(files_cc_m4:.m4=) wrap_init.cc
-files_built_h  = $(files_hg:.hg=.h) $(files_h_m4:.m4=)
-files_built_ph = $(files_hg:%.hg=private/%_p.h)
+glibmm_files_built_cc = $(glibmm_files_hg:.hg=.cc) $(glibmm_files_cc_m4:.m4=) wrap_init.cc
+glibmm_files_built_h  = $(glibmm_files_hg:.hg=.h) $(glibmm_files_h_m4:.m4=)
+glibmm_files_built_ph = $(glibmm_files_hg:%.hg=private/%_p.h)
 
-files_extra_cc =			\
+glibmm_files_extra_cc =			\
 	class.cc			\
 	containers.cc			\
 	debug.cc			\
@@ -38,7 +38,7 @@ files_extra_cc =			\
 	value_custom.cc			\
 	wrap.cc
 
-files_extra_h =				\
+glibmm_files_extra_h =			\
 	arrayhandle.h			\
 	class.h				\
 	containerhandle_shared.h	\
@@ -81,6 +81,6 @@ files_extra_h =				\
 	wrap.h				\
 	wrap_init.h
 
-files_extra_ph =			\
+glibmm_files_extra_ph =			\
 	private/interface_p.h		\
 	private/object_p.h
diff --git a/glib/src/Makefile.am b/glib/src/Makefile.am
index 76ffe286..cb209cdd 100644
--- a/glib/src/Makefile.am
+++ b/glib/src/Makefile.am
@@ -25,9 +25,14 @@ codegen_srcdir  = $(top_srcdir)/tools
 
 include $(srcdir)/filelist.am
 include $(top_srcdir)/tools/m4/filelist.am
+
+files_defs = $(glibmm_files_defs)
+files_ccg  = $(glibmm_files_ccg)
+files_hg   = $(glibmm_files_hg)
+
 include $(top_srcdir)/build/generate-binding.am
 
-files_src_m4 = $(files_cc_m4) $(files_h_m4)
+files_src_m4 = $(glibmm_files_cc_m4) $(glibmm_files_h_m4)
 
 other_built_sources += $(files_src_m4:%.m4=$(binding_outputdir)/%)
 dist_noinst_DATA    += $(files_src_m4) template.macros.m4
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 3d061c19..bb99ab99 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -1,6 +1,6 @@
 ## This file is part of glibmm.
 
-files_defs =			\
+glibmm_files_defs =		\
 	glib.defs		\
 	glib_enums.defs		\
 	glib_functions.defs	\
@@ -12,7 +12,7 @@ files_defs =			\
 	glib_docs.xml		\
 	glib_docs_override.xml
 
-files_hg =			\
+glibmm_files_hg =		\
 	checksum.hg		\
 	convert.hg		\
 	date.hg			\
@@ -33,7 +33,7 @@ files_hg =			\
 	uriutils.hg		\
 	valuearray.hg
 
-files_ccg = $(files_hg:%.hg=%.ccg)
+glibmm_files_ccg = $(glibmm_files_hg:.hg=.ccg)
 
-files_cc_m4 = value_basictypes.cc.m4
-files_h_m4  = signalproxy.h.m4 value_basictypes.h.m4
+glibmm_files_cc_m4 = value_basictypes.cc.m4
+glibmm_files_h_m4  = signalproxy.h.m4 value_basictypes.h.m4