[pangomm] Allow other modules to use the m4 files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] Allow other modules to use the m4 files.
- Date: Fri, 7 Jan 2011 22:35:46 +0000 (UTC)
commit 20935b3d57dda84dfea3a9e11950a36f895ab5dd
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Jan 7 23:33:53 2011 +0100
Allow other modules to use the m4 files.
* codegen/Makefile.am: Install the m4 files, like gtkmm installs its files.
* pango/pangomm.pc.in: Add the gmmproc4mdir variable so that other modules such
as gtkmm and cluttermm can get the path to the m4 file, to avoid
duplicating its contents.
ChangeLog | 9 +++++++++
pango/pangomm.pc.in | 2 ++
tools/Makefile.am | 9 ++++++++-
3 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5d186c4..559d72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2011-01-07 Murray Cumming <murrayc murrayc com>
+ Allow other modules to use the m4 files.
+
+ * codegen/Makefile.am: Install the m4 files, like gtkmm installs its files.
+ * pango/pangomm.pc.in: Add the gmmproc4mdir variable so that other modules such
+ as gtkmm and cluttermm can get the path to the m4 file, to avoid
+ duplicating its contents.
+
+2011-01-07 Murray Cumming <murrayc murrayc com>
+
Fix the build with --enable-warnings=fatal.
* configure.ac: Add no-long-long to avoid a warning caused by a newer glib.
diff --git a/pango/pangomm.pc.in b/pango/pangomm.pc.in
index 4903299..b02734b 100644
--- a/pango/pangomm.pc.in
+++ b/pango/pangomm.pc.in
@@ -5,6 +5,8 @@ datarootdir= datarootdir@
datadir= datadir@
includedir= includedir@
+gmmprocm4dir=${libdir}/@PANGOMM_MODULE_NAME@/proc/m4
+
docdir=${datarootdir}/doc/@PANGOMM_MODULE_NAME@
doxytagfile=${docdir}/reference/@PANGOMM_MODULE_NAME tag
htmlrefdir=${docdir}/reference/html
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a7aa237..f8f2f2f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,7 +19,14 @@ AUTOMAKE_OPTIONS = subdir-objects
include $(srcdir)/m4/filelist.am
-dist_noinst_DATA = $(addprefix m4/,$(files_codegen_m4))
+# Install m4 files for reuse by other *mm projects, when building from git:
+# TODO: All these Perl scripts and M4 files are architecture-independent
+# and should probably go somewhere below $(pkgdatadir) instead.
+gmmproc_bindir = $(libdir)/$(PANGOMM_MODULE_NAME)/proc
+gmmproc_m4dir = $(gmmproc_bindir)/m4
+dist_gmmproc_m4_DATA = $(files_codegen_m4:%=m4/%)
+
+dist_noinst_DATA = README
noinst_PROGRAMS = extra_defs_gen/generate_extra_defs
extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_pango.cc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]