build: Split out automake-specific items from filelist.am's

This will prepare the filelist.am's to be also usable with the NMake
Makefiles, so that they can be shared with the autotools build files.

10 files changed, 40 insertions, 20 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 62979459..31dd5bd7 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,9 +16,9 @@
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 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
+include $(top_srcdir)/glib/glibmm/filelist.gmake.am
+include $(top_srcdir)/gio/src/filelist.gmake.am
+include $(top_srcdir)/gio/giomm/filelist.gmake.am
 
 glibmm_files_h = $(filter-out wrap_init.h,$(glibmm_files_all_h))
 giomm_files_h  = $(filter-out wrap_init.h,$(giomm_files_all_h))
diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am
index b03256c5..86b4978d 100644
--- a/gio/giomm/Makefile.am
+++ b/gio/giomm/Makefile.am
@@ -17,8 +17,8 @@
 
 lib_LTLIBRARIES = libgiomm-@GIOMM_API_VERSION@.la
 
-include $(srcdir)/../src/filelist.am
-include $(srcdir)/filelist.am
+include $(srcdir)/../src/filelist.gmake.am
+include $(srcdir)/filelist.gmake.am
 
 files_built_cc = $(giomm_files_built_cc)
 files_built_h  = $(giomm_files_built_h)
diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am
index 98c0e645..4cc2a50e 100644
--- a/gio/giomm/filelist.am
+++ b/gio/giomm/filelist.am
@@ -2,7 +2,6 @@
 
 giomm_files_built_cc = $(giomm_files_used_hg:.hg=.cc) wrap_init.cc
 giomm_files_built_h  = $(giomm_files_used_hg:.hg=.h)
-giomm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(giomm_files_used_hg))
 
 giomm_files_extra_cc = contenttype.cc init.cc slot_async.cc socketsource.cc
 giomm_files_extra_h  = contenttype.h init.h socketsource.h wrap_init.h
diff --git a/gio/giomm/filelist.gmake.am b/gio/giomm/filelist.gmake.am
new file mode 100644
index 00000000..73f9dd83
--- /dev/null
+++ b/gio/giomm/filelist.gmake.am
@@ -0,0 +1,6 @@
+## This file is part of glibmm.
+
+include $(top_srcdir)/gio/giomm/filelist.am
+
+# Taken out from $(top_srcdir)/gio/giomm/filelist.am
+giomm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(giomm_files_used_hg))
diff --git a/gio/src/Makefile.am b/gio/src/Makefile.am
index 226d3a95..1fdf3645 100644
--- a/gio/src/Makefile.am
+++ b/gio/src/Makefile.am
@@ -23,7 +23,7 @@ binding_name    = giomm
 wrap_init_flags = --namespace=Gio --parent_dir=giomm
 codegen_srcdir  = $(top_srcdir)/tools
 
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
 include $(top_srcdir)/tools/m4/filelist.am
 
 files_defs = $(giomm_files_defs)
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index 9d1c0fed..92b94bbe 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -147,17 +147,6 @@ giomm_files_posix_hg =			\
 giomm_files_not_mac =			\
 	desktopappinfo.hg
 
-if HOST_WINDOWS_NATIVE
-giomm_files_arch_hg =
-else
-if OS_COCOA
-giomm_files_arch_hg = $(giomm_files_posix_hg)
-else
-giomm_files_arch_hg = $(giomm_files_not_mac) $(giomm_files_posix_hg)
-endif
-endif
-giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg)
-
 giomm_files_hg = \
   $(giomm_files_any_hg) \
   $(giomm_files_posix_hg) \
diff --git a/gio/src/filelist.gmake.am b/gio/src/filelist.gmake.am
new file mode 100644
index 00000000..c9660ca3
--- /dev/null
+++ b/gio/src/filelist.gmake.am
@@ -0,0 +1,21 @@
+## This file is part of glibmm.
+
+include $(top_srcdir)/gio/src/filelist.am
+
+# Split out from $(top_srcdir)/gio/src/filelist.am
+if HOST_WINDOWS_NATIVE
+giomm_files_arch_hg =
+else
+if OS_COCOA
+giomm_files_arch_hg = $(giomm_files_posix_hg)
+else
+giomm_files_arch_hg = $(giomm_files_not_mac) $(giomm_files_posix_hg)
+endif
+endif
+giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg)
+
+giomm_files_hg = \
+  $(giomm_files_any_hg) \
+  $(giomm_files_posix_hg) \
+  $(giomm_files_not_mac)
+giomm_files_ccg = $(giomm_files_hg:.hg=.ccg)
diff --git a/glib/glibmm/Makefile.am b/glib/glibmm/Makefile.am
index 2b6daa9d..5afbbe04 100644
--- a/glib/glibmm/Makefile.am
+++ b/glib/glibmm/Makefile.am
@@ -18,7 +18,7 @@
 lib_LTLIBRARIES = libglibmm-@GLIBMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
 
 files_built_cc = $(glibmm_files_built_cc)
 files_built_h  = $(glibmm_files_built_h)
diff --git a/glib/glibmm/filelist.am b/glib/glibmm/filelist.am
index b5a61695..32d5e84d 100644
--- a/glib/glibmm/filelist.am
+++ b/glib/glibmm/filelist.am
@@ -2,7 +2,6 @@
 
 glibmm_files_built_cc = $(glibmm_files_used_hg:.hg=.cc) $(glibmm_files_cc_m4:.m4=) wrap_init.cc
 glibmm_files_built_h  = $(glibmm_files_used_hg:.hg=.h) $(glibmm_files_h_m4:.m4=)
-glibmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(glibmm_files_used_hg))
 
 glibmm_files_extra_cc =			\
 	arrayhandle.cc			\
diff --git a/glib/glibmm/filelist.gmake.am b/glib/glibmm/filelist.gmake.am
new file mode 100644
index 00000000..8068dc89
--- /dev/null
+++ b/glib/glibmm/filelist.gmake.am
@@ -0,0 +1,6 @@
+## This file is part of glibmm.
+
+include $(top_srcdir)/glib/glibmm/filelist.am
+
+# Split out from $(top_srcdir)/glib/glimm/filelist.am
+glibmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(glibmm_files_used_hg))