[pangomm/pangomm-2-40.nmake: 1/3] build: Split out automake'isms out from filelist.am's



commit 5b841f41c4e03eb39b29bb8c497c3105c2248d4b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Oct 26 18:17:33 2018 +0800

    build: Split out automake'isms out from filelist.am's
    
    This is so that the NMake Makefiles can consume them as well.

 docs/Makefile.am                | 2 +-
 pango/pangomm/Makefile.am       | 2 +-
 pango/pangomm/filelist.am       | 1 -
 pango/pangomm/filelist.gmake.am | 5 +++++
 4 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 35cc297..774ea72 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,7 +16,7 @@
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 include $(top_srcdir)/pango/src/filelist.am
-include $(top_srcdir)/pango/pangomm/filelist.am
+include $(top_srcdir)/pango/pangomm/filelist.gmake.am
 
 pangomm_files_h = $(files_built_h) $(filter-out wrap_init.h,$(files_extra_h))
 
diff --git a/pango/pangomm/Makefile.am b/pango/pangomm/Makefile.am
index 08de02b..675d7e4 100644
--- a/pango/pangomm/Makefile.am
+++ b/pango/pangomm/Makefile.am
@@ -18,7 +18,7 @@
 lib_LTLIBRARIES = libpangomm-@PANGOMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
-include $(srcdir)/filelist.am
+include $(srcdir)/filelist.gmake.am
 include $(top_srcdir)/build/compile-binding.am
 
 local_cppflags = $(binding_includes) $(binding_cppflags) -DPANGOMM_BUILD=1
diff --git a/pango/pangomm/filelist.am b/pango/pangomm/filelist.am
index 1520f53..9bf9b89 100644
--- a/pango/pangomm/filelist.am
+++ b/pango/pangomm/filelist.am
@@ -2,7 +2,6 @@
 
 files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
 files_built_h  = $(files_hg:.hg=.h)
-files_built_ph = $(patsubst %.hg,private/%_p.h,$(files_hg))
 files_extra_cc = init.cc
 files_extra_h  = init.h types.h wrap_init.h
 files_extra_ph =
diff --git a/pango/pangomm/filelist.gmake.am b/pango/pangomm/filelist.gmake.am
new file mode 100644
index 0000000..fcda47c
--- /dev/null
+++ b/pango/pangomm/filelist.gmake.am
@@ -0,0 +1,5 @@
+## This file is part of pangomm.
+include $(top_srcdir)/pango/pangomm/filelist.am
+
+# Seperated from $(srcdir)/filelist.am
+files_built_ph  = $(patsubst %.hg,private/%_p.h,$(files_hg))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]