[atkmm/atkmm-2-24.nmake: 3/5] atk/atkmm/filelist.am: Split out automake'ism
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atkmm/atkmm-2-24.nmake: 3/5] atk/atkmm/filelist.am: Split out automake'ism
- Date: Fri, 26 Oct 2018 04:05:53 +0000 (UTC)
commit 69da40c250209d20076076f0a0c3f5ade8f61390
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Oct 25 18:04:36 2018 +0800
atk/atkmm/filelist.am: Split out automake'ism
Move the automake-specific part out so that this file can also be
re-used by the NMake Makefiles.
atk/atkmm/Makefile.am | 3 ++-
atk/atkmm/filelist.am | 1 -
atk/atkmm/filelist.gmake.am | 4 ++++
doc/Makefile.am | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/atk/atkmm/Makefile.am b/atk/atkmm/Makefile.am
index 682c4ad..fed937a 100644
--- a/atk/atkmm/Makefile.am
+++ b/atk/atkmm/Makefile.am
@@ -18,7 +18,8 @@
lib_LTLIBRARIES = libatkmm-@ATKMM_API_VERSION@.la
include $(srcdir)/../src/filelist.am
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
+
files_built_cc = $(atkmm_files_built_cc)
files_built_h = $(atkmm_files_built_h)
diff --git a/atk/atkmm/filelist.am b/atk/atkmm/filelist.am
index 7c7355d..ab4af39 100644
--- a/atk/atkmm/filelist.am
+++ b/atk/atkmm/filelist.am
@@ -2,7 +2,6 @@
atkmm_files_built_cc = $(atkmm_files_hg:.hg=.cc) wrap_init.cc
atkmm_files_built_h = $(atkmm_files_hg:.hg=.h)
-atkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(atkmm_files_hg))
atkmm_files_extra_cc = init.cc
atkmm_files_extra_h = init.h wrap_init.h
diff --git a/atk/atkmm/filelist.gmake.am b/atk/atkmm/filelist.gmake.am
new file mode 100644
index 0000000..321a6ce
--- /dev/null
+++ b/atk/atkmm/filelist.gmake.am
@@ -0,0 +1,4 @@
+include $(top_srcdir)/atk/atkmm/filelist.am
+
+# Split out from $(srcdir)/filelist.am
+atkmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(atkmm_files_hg))
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a800a4d..e43c24d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/atk/src/filelist.am
-include $(top_srcdir)/atk/atkmm/filelist.am
+include $(top_srcdir)/atk/atkmm/filelist.gmake.am
atkmm_files_h = $(atkmm_files_built_h) $(filter-out wrap_init.h,$(atkmm_files_extra_h))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]