summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2018-09-10 14:02:56 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2018-10-29 15:36:08 +0800
commit669cbddaf69cd0a9f888512e8c73748dd78c7b1d (patch)
tree0752fc5d28dbd5f2c672b914cded5ed3bcda2784 /glib
parent82154007466e08d3f88ebb7ca245a1652170984a (diff)
downloadglibmm-669cbddaf69cd0a9f888512e8c73748dd78c7b1d.tar.gz
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.
Diffstat (limited to 'glib')
-rw-r--r--glib/glibmm/Makefile.am2
-rw-r--r--glib/glibmm/filelist.am1
-rw-r--r--glib/glibmm/filelist.gmake.am6
3 files changed, 7 insertions, 2 deletions
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))