[gtkmm/gtkmm-3-24.nmake: 5/7] build: Remove GNU Makeisms from filelist.am's
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3-24.nmake: 5/7] build: Remove GNU Makeisms from filelist.am's
- Date: Wed, 12 Sep 2018 11:55:00 +0000 (UTC)
commit b17c414e7b49f86f0912820ee9290ebc69f821e0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 23 17:41:17 2018 +0800
build: Remove GNU Makeisms from filelist.am's
This is so that they can be used by the NMake Makefiles as well.
gdk/gdkmm/Makefile.am | 4 ++--
gdk/gdkmm/filelist.am | 1 -
gdk/gdkmm/filelist.gmake.am | 5 +++++
gdk/src/Makefile.am | 2 +-
gdk/src/filelist.am | 11 -----------
gdk/src/filelist.gmake.am | 15 +++++++++++++++
gtk/gtkmm/Makefile.am | 4 ++--
gtk/gtkmm/filelist.am | 10 ----------
gtk/gtkmm/filelist.gmake.am | 13 +++++++++++++
gtk/src/Makefile.am | 2 +-
gtk/src/filelist.am | 22 ----------------------
gtk/src/filelist.gmake.am | 25 +++++++++++++++++++++++++
12 files changed, 64 insertions(+), 50 deletions(-)
---
diff --git a/gdk/gdkmm/Makefile.am b/gdk/gdkmm/Makefile.am
index e669cd87..babffb71 100644
--- a/gdk/gdkmm/Makefile.am
+++ b/gdk/gdkmm/Makefile.am
@@ -17,8 +17,8 @@
lib_LTLIBRARIES = libgdkmm-@GDKMM_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 = $(gdkmm_files_built_cc)
files_built_h = $(gdkmm_files_built_h)
diff --git a/gdk/gdkmm/filelist.am b/gdk/gdkmm/filelist.am
index 504439be..2ad7229a 100644
--- a/gdk/gdkmm/filelist.am
+++ b/gdk/gdkmm/filelist.am
@@ -2,7 +2,6 @@
gdkmm_files_built_cc = $(gdkmm_files_used_hg:.hg=.cc) wrap_init.cc
gdkmm_files_built_h = $(gdkmm_files_used_hg:.hg=.h)
-gdkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(gdkmm_files_used_hg))
gdkmm_files_extra_cc = general.cc
gdkmm_files_extra_h = general.h wrap_init.h
diff --git a/gdk/gdkmm/filelist.gmake.am b/gdk/gdkmm/filelist.gmake.am
new file mode 100644
index 00000000..cdd158dd
--- /dev/null
+++ b/gdk/gdkmm/filelist.gmake.am
@@ -0,0 +1,5 @@
+## This file is part of gtkmm.
+
+include $(srcdir)/filelist.am
+
+gdkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(gdkmm_files_used_hg))
diff --git a/gdk/src/Makefile.am b/gdk/src/Makefile.am
index 038b87ed..d7735f37 100644
--- a/gdk/src/Makefile.am
+++ b/gdk/src/Makefile.am
@@ -19,7 +19,7 @@ binding_name = gdkmm
wrap_init_flags = --namespace=Gdk --parent_dir=gdkmm
codegen_srcdir = $(top_srcdir)/tools
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
include $(top_srcdir)/tools/m4/filelist.am
files_defs = $(gdkmm_files_defs)
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index 157478a6..8f420f31 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -43,14 +43,3 @@ gdkmm_files_any_hg = \
gdkmm_files_deprecated_hg = \
color.hg
-if DISABLE_DEPRECATED_API
-gdkmm_files_used_hg = $(gdkmm_files_any_hg)
-else
-gdkmm_files_used_hg = $(gdkmm_files_any_hg) $(gdkmm_files_deprecated_hg)
-endif
-
-gdkmm_files_hg = \
- $(gdkmm_files_any_hg) \
- $(gdkmm_files_deprecated_hg)
-
-gdkmm_files_ccg = $(gdkmm_files_hg:.hg=.ccg)
diff --git a/gdk/src/filelist.gmake.am b/gdk/src/filelist.gmake.am
new file mode 100644
index 00000000..48eb66c4
--- /dev/null
+++ b/gdk/src/filelist.gmake.am
@@ -0,0 +1,15 @@
+# This file is part of gtkmm
+
+include $(srcdir)/../src/filelist.am
+
+if DISABLE_DEPRECATED_API
+gdkmm_files_used_hg = $(gdkmm_files_any_hg)
+else
+gdkmm_files_used_hg = $(gdkmm_files_any_hg) $(gdkmm_files_deprecated_hg)
+endif
+
+gdkmm_files_hg = \
+ $(gdkmm_files_any_hg) \
+ $(gdkmm_files_deprecated_hg)
+
+gdkmm_files_ccg = $(gdkmm_files_hg:.hg=.ccg)
diff --git a/gtk/gtkmm/Makefile.am b/gtk/gtkmm/Makefile.am
index 1e48884d..b355dfea 100644
--- a/gtk/gtkmm/Makefile.am
+++ b/gtk/gtkmm/Makefile.am
@@ -17,8 +17,8 @@
lib_LTLIBRARIES = libgtkmm-@GTKMM_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 = $(gtkmm_files_built_cc)
files_built_h = $(gtkmm_files_built_h)
diff --git a/gtk/gtkmm/filelist.am b/gtk/gtkmm/filelist.am
index 6fa93584..6f0a1f86 100644
--- a/gtk/gtkmm/filelist.am
+++ b/gtk/gtkmm/filelist.am
@@ -2,7 +2,6 @@
gtkmm_files_built_cc = $(gtkmm_files_used_hg:.hg=.cc) wrap_init.cc
gtkmm_files_built_h = $(gtkmm_files_used_hg:.hg=.h)
-gtkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(gtkmm_files_used_hg))
gtkmm_files_extra_any_cc = \
accelkey.cc \
@@ -47,12 +46,3 @@ gtkmm_files_extra_deprecated_h = \
gtkmm_files_extra_ph = \
private/object_p.h
-
-if DISABLE_DEPRECATED_API
-gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc)
-gtkmm_files_extra_h = $(gtkmm_files_extra_any_h)
-else
-gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc) $(gtkmm_files_extra_deprecated_cc)
-gtkmm_files_extra_h = $(gtkmm_files_extra_any_h) $(gtkmm_files_extra_deprecated_h)
-endif
-
diff --git a/gtk/gtkmm/filelist.gmake.am b/gtk/gtkmm/filelist.gmake.am
new file mode 100644
index 00000000..e7ada986
--- /dev/null
+++ b/gtk/gtkmm/filelist.gmake.am
@@ -0,0 +1,13 @@
+## This file is part of gtkmm.
+
+include $(srcdir)/filelist.am
+
+if DISABLE_DEPRECATED_API
+gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc)
+gtkmm_files_extra_h = $(gtkmm_files_extra_any_h)
+else
+gtkmm_files_extra_cc = $(gtkmm_files_extra_any_cc) $(gtkmm_files_extra_deprecated_cc)
+gtkmm_files_extra_h = $(gtkmm_files_extra_any_h) $(gtkmm_files_extra_deprecated_h)
+endif
+
+gtkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(gtkmm_files_used_hg))
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 6af79a1b..b6e9a0b0 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -19,7 +19,7 @@ binding_name = gtkmm
wrap_init_flags = --namespace=Gtk --parent_dir=gtkmm
codegen_srcdir = $(top_srcdir)/tools
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
include $(top_srcdir)/tools/m4/filelist.am
files_defs = $(gtkmm_files_defs)
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index ed0a4b68..cf943314 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -249,25 +249,3 @@ gtkmm_files_deprecated_hg = \
tearoffmenuitem.hg \
toggleaction.hg \
uimanager.hg
-
-if HOST_WINDOWS_NATIVE
-gtkmm_files_arch_hg =
-else
-gtkmm_files_arch_hg = $(gtkmm_files_posix_hg)
-endif
-if GDK_TARGET_X11
-gtkmm_files_arch_hg += $(gtkmm_files_x11_hg)
-endif
-if DISABLE_DEPRECATED_API
-gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg)
-else
-gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg) $(gtkmm_files_deprecated_hg)
-endif
-
-gtkmm_files_hg = \
- $(gtkmm_files_any_hg) \
- $(gtkmm_files_posix_hg) \
- $(gtkmm_files_x11_hg) \
- $(gtkmm_files_deprecated_hg)
-
-gtkmm_files_ccg = $(gtkmm_files_hg:.hg=.ccg)
diff --git a/gtk/src/filelist.gmake.am b/gtk/src/filelist.gmake.am
new file mode 100644
index 00000000..47590de8
--- /dev/null
+++ b/gtk/src/filelist.gmake.am
@@ -0,0 +1,25 @@
+## This file is part of gtkmm.
+
+include $(srcdir)/../src/filelist.am
+
+if HOST_WINDOWS_NATIVE
+gtkmm_files_arch_hg =
+else
+gtkmm_files_arch_hg = $(gtkmm_files_posix_hg)
+endif
+if GDK_TARGET_X11
+gtkmm_files_arch_hg += $(gtkmm_files_x11_hg)
+endif
+if DISABLE_DEPRECATED_API
+gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg)
+else
+gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg) $(gtkmm_files_deprecated_hg)
+endif
+
+gtkmm_files_hg = \
+ $(gtkmm_files_any_hg) \
+ $(gtkmm_files_posix_hg) \
+ $(gtkmm_files_x11_hg) \
+ $(gtkmm_files_deprecated_hg)
+
+gtkmm_files_ccg = $(gtkmm_files_hg:.hg=.ccg)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]