[atkmm] Allow other modules to use the m4 files.



commit 1d154b3916b9c3b401575533230478014c985fd1
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 7 23:31:56 2011 +0100

    Allow other modules to use the m4 files.
    
    * codegen/Makefile.am: Install the m4 files, like gtkmm installs its files.
    * atk/atkmm.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 +++++++++
 atk/atkmm.pc.in     |    2 ++
 codegen/Makefile.am |   13 +++++++------
 3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 11a796e..4fce3f5 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.
+	* atk/atkmm.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/atk/atkmm.pc.in b/atk/atkmm.pc.in
index d0566bb..2d8474c 100644
--- a/atk/atkmm.pc.in
+++ b/atk/atkmm.pc.in
@@ -5,6 +5,8 @@ datarootdir= datarootdir@
 datadir= datadir@
 includedir= includedir@
 
+gmmprocm4dir=${libdir}/@ATKMM_MODULE_NAME@/proc/m4
+
 docdir=${datarootdir}/doc/@ATKMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@ATKMM_MODULE_NAME  tag
 htmlrefdir=${docdir}/reference/html
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index dbf0da3..d52033d 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -19,12 +19,13 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 include $(srcdir)/m4/filelist.am
 
-# For now, gtkmm ships with a copy of the atkmm conversion specifications,
-# thus the M4 files are not installed with atkmm.
-# In order to change that, all depending packages will have to be modified
-# as well, since for M4 files we do not have a mechanism like pkg-config for
-# resolving module dependencies and building an include path automatically.
-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)/$(ATKMM_MODULE_NAME)/proc
+gmmproc_m4dir  = $(gmmproc_bindir)/m4
+dist_gmmproc_m4_DATA = $(files_codegen_m4:%=m4/%)
+
 noinst_PROGRAMS  = extradefs/generate_extra_defs
 
 extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_atk.cc



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