[glibmm] Bug 587173 - Fails to install when bootstrapped with Automake 1.11

[Jonathon Jongsma <jjongsma src gnome org>]

commit 7a885c150739214110e85748bcf340de34fca610
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Tue Jul 14 16:34:14 2009 -0500

    Bug 587173 - Fails to install when bootstrapped with Automake 1.11

 ChangeLog                                |    8 ++++++++
 glib/glibmm/Makefile.am                  |    2 --
 glib/src/Makefile_list_of_hg.am_fragment |   23 ++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f7ddece..8950823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-14  Jonathon Jongsma  <jonathon quotidian org>
+
+	* Fix Bug #587173 â?? Fails to install when bootstrapped with Automake 1.11
+	* glib/glibmm/Makefile.am: remove .hg-generated headers from this
+	  Makefile to fix built with automake-1.11
+	* glib/src/Makefile_list_of_hg.am_fragment: re-format this list of
+	  .hg files so it's easier to both read and maintain
+
 2009-07-14  José Alburquerque  <jaalburqu svn gnome org>
 
 	* glib/src/glib_docs_override.xml:
diff --git a/glib/glibmm/Makefile.am b/glib/glibmm/Makefile.am
index 973a33b..b6b3d46 100644
--- a/glib/glibmm/Makefile.am
+++ b/glib/glibmm/Makefile.am
@@ -65,8 +65,6 @@ sublib_files_extra_general_h = \
   i18n-lib.h \
   i18n.h \
   interface.h \
-  iochannel.h \
-  keyfile.h \
   listhandle.h \
   main.h \
   miscutils.h \
diff --git a/glib/src/Makefile_list_of_hg.am_fragment b/glib/src/Makefile_list_of_hg.am_fragment
index 8d48fbc..a3b4b44 100644
--- a/glib/src/Makefile_list_of_hg.am_fragment
+++ b/glib/src/Makefile_list_of_hg.am_fragment
@@ -5,10 +5,27 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = checksum.hg convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg \
-                   module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg \
-                   shell.hg spawn.hg thread.hg nodetree.hg unicode.hg uriutils.hg \
+files_general_hg = \
+                   checksum.hg \
+                   convert.hg \
+                   date.hg \
+                   fileutils.hg \
+                   iochannel.hg \
+                   keyfile.hg \
+                   markup.hg \
+                   module.hg \
+                   optioncontext.hg \
+                   optionentry.hg \
+                   optiongroup.hg \
+                   regex.hg \
+                   shell.hg \
+                   spawn.hg \
+                   thread.hg \
+                   nodetree.hg \
+                   unicode.hg \
+                   uriutils.hg \
                    valuearray.hg
+
 files_general_deprecated_hg =
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment