Convert gio/ sub-tree to new build system

* gio/src/filelist.am: New file for defining the lists of
gmmproc input files.
* gio/src/Makefile.am: Clean up and modernize.  Integrate
with the new generate-binding.am build file from mm-common.
* gio/giomm/filelist.am: New file for the lists of source
code files, both generated and static.  Also list files from
the private/ subdirectory here.
* gio/giomm/Makefile.am: Clean up and modernize.  Integrate
with the new compile-binding.am build file from mm-common.
* configure.ac (AC_CONFIG_FILES): Remove the output file
gio/giomm/private/Makefile from the list.
* gio/giomm/private/Makefile.am: Delete file.
* gio/src/Makefile_list_of_hg.am_fragment: Delete file.

4 files changed, 37 insertions, 40 deletions

diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am
index 4c931536..9b0f52fd 100644
--- a/gio/giomm/Makefile.am
+++ b/gio/giomm/Makefile.am
@@ -1,33 +1,36 @@
-## Copyright (c) 2007
-## The gtkmm development team.
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of glibmm.
+##
+## glibmm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## glibmm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS			= private
+lib_LTLIBRARIES = libgiomm-2.4.la
 
-sublib_name		= giomm
-sublib_libname		= giomm-2.4
-sublib_libversion       = $(LIBGLIBMM_SO_VERSION)
-sublib_namespace	= Gio
-sublib_cflags		= $(GIOMM_CFLAGS)
-sublib_topdir = gio
-sublib_win32_dlls_libs	=
+include $(srcdir)/../src/filelist.am
+include $(srcdir)/filelist.am
+include $(top_srcdir)/build/compile-binding.am
 
-sublib_files_extra_posix_cc =
-sublib_files_extra_win32_cc =
-sublib_files_extra_general_cc = init.cc contenttype.cc slot_async.cc
-sublib_files_extra_general_deprecated_cc = 
+dist_noinst_HEADERS = slot_async.h
 
-sublib_files_extra_posix_h =
-sublib_files_extra_win32_h =
-sublib_files_extra_general_h = init.h contenttype.h
-sublib_files_extra_general_deprecated_h = 
+local_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
+local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags)
 
-include $(top_srcdir)/build_shared/Makefile_build.am_fragment
+AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GIOMM_CFLAGS)
+AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
 
-lib_LTLIBRARIES		= libgiomm-2.4.la
-libgiomm_2_4_la_SOURCES	= $(files_built_cc) $(files_extra_cc)
-libgiomm_2_4_la_LDFLAGS	= $(common_ldflags)
-libgiomm_2_4_la_LIBADD	= $(GIOMM_LIBS) \
-                          $(top_builddir)/glib/glibmm/libglibmm-2.4.la
+local_libadd = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
 
-# this header should be distributed, but not installed
-EXTRA_DIST=slot_async.h
+libgiomm_2_4_la_SOURCES = $(binding_sources)
+libgiomm_2_4_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
+libgiomm_2_4_la_LIBADD  = $(GIOMM_LIBS) $(local_libadd)
diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am
new file mode 100644
index 00000000..3c79eaa1
--- /dev/null
+++ b/gio/giomm/filelist.am
@@ -0,0 +1,8 @@
+## 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)
+
+files_extra_cc = contenttype.cc init.cc slot_async.cc
+files_extra_h  = contenttype.h init.h
diff --git a/gio/giomm/private/.gitignore b/gio/giomm/private/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gio/giomm/private/.gitignore
diff --git a/gio/giomm/private/Makefile.am b/gio/giomm/private/Makefile.am
deleted file mode 100644
index e17670a6..00000000
--- a/gio/giomm/private/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## Copyright (c) 2001
-## The gtkmm development team.
-
-include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
-files_built_p_h = $(files_all_hg:.hg=_p.h)
-
-private_includedir	= $(includedir)/giomm-2.4/giomm/private
-private_include_HEADERS	= $(files_built_p_h)
-
-maintainer-clean-local:
-	(cd $(srcdir) && rm -f $(files_built_p_h))
-
-
-