diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-09 22:59:13 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-09 22:59:13 +0200 |
| commit | 464e1e45a2f6ef0fefa4dadd6eaa12689770c2b1 (patch) | |
| tree | 62ec0defa6712eef184e3fc0705d378f81ee07e6 | |
| parent | 90feeb3e3b0f392d418a5a48c3711e5824ab086c (diff) | |
| download | glibmm-464e1e45a2f6ef0fefa4dadd6eaa12689770c2b1.tar.gz | |
Work around Automake cleverness failure
* gio/giomm/filelist.am (giomm_files_built_ph): Use the GNU
make $(patsubst ...) function instead of $(var:%=foo%bar) if
a simple $(var:.a=.b) is not sufficient. Apparently Automake
is able to expand some of these constructs statically, but in
some cases it will actually produce the wrong result. Using
$(patsubst ...) helps to avoid the problem because Automake
does not attempt to expand it.
* glib/glibmm/filelist.am (glibmm_files_built_ph): Use the
$(patsubst ...) function here, too.
* gio/src/filelist.am (giomm_files_used_hg): Define another
intermediate variable to avoid repetition.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | gio/giomm/filelist.am | 9 | ||||
| -rw-r--r-- | gio/src/filelist.am | 1 | ||||
| -rw-r--r-- | glib/glibmm/filelist.am | 2 |
4 files changed, 22 insertions, 6 deletions
@@ -1,5 +1,21 @@ 2009-08-09 Daniel Elstner <danielk@openismus.com> + Work around Automake cleverness failure + + * gio/giomm/filelist.am (giomm_files_built_ph): Use the GNU + make $(patsubst ...) function instead of $(var:%=foo%bar) if + a simple $(var:.a=.b) is not sufficient. Apparently Automake + is able to expand some of these constructs statically, but in + some cases it will actually produce the wrong result. Using + $(patsubst ...) helps to avoid the problem because Automake + does not attempt to expand it. + * glib/glibmm/filelist.am (glibmm_files_built_ph): Use the + $(patsubst ...) function here, too. + * gio/src/filelist.am (giomm_files_used_hg): Define another + intermediate variable to avoid repetition. + +2009-08-09 Daniel Elstner <danielk@openismus.com> + Get rid of all Makefile.am in the MSVC dirs * MSVC_Net2005/**/Makefile.am: Delete recursive build files. diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am index 541947de..ceee372a 100644 --- a/gio/giomm/filelist.am +++ b/gio/giomm/filelist.am @@ -1,10 +1,9 @@ ## This file is part of glibmm. -giomm_files_built_cc = $(giomm_files_any_hg:.hg=.cc) $(giomm_files_arch_hg:.hg=.cc) wrap_init.cc -giomm_files_built_h = $(giomm_files_any_hg:.hg=.h) $(giomm_files_arch_hg:.hg=.h) -giomm_files_built_ph = $(giomm_files_any_hg:%.hg=private/%_p.h) \ - $(giomm_files_arch_hg:%.hg=private/%_p.h) +giomm_files_built_cc = $(giomm_files_used_hg:.hg=.cc) wrap_init.cc +giomm_files_built_h = $(giomm_files_used_hg:.hg=.h) +giomm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(giomm_files_used_hg)) giomm_files_extra_cc = contenttype.cc init.cc slot_async.cc -giomm_files_extra_h = contenttype.h init.h +giomm_files_extra_h = contenttype.h init.h wrap_init.h giomm_files_extra_ph = diff --git a/gio/src/filelist.am b/gio/src/filelist.am index f07b3164..9de60ffd 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -71,6 +71,7 @@ giomm_files_arch_hg = else giomm_files_arch_hg = $(giomm_files_posix_hg) endif +giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg) giomm_files_hg = $(giomm_files_any_hg) $(giomm_files_posix_hg) giomm_files_ccg = $(giomm_files_hg:.hg=.ccg) diff --git a/glib/glibmm/filelist.am b/glib/glibmm/filelist.am index 74d3cf02..ccc7202d 100644 --- a/glib/glibmm/filelist.am +++ b/glib/glibmm/filelist.am @@ -2,7 +2,7 @@ glibmm_files_built_cc = $(glibmm_files_hg:.hg=.cc) $(glibmm_files_cc_m4:.m4=) wrap_init.cc glibmm_files_built_h = $(glibmm_files_hg:.hg=.h) $(glibmm_files_h_m4:.m4=) -glibmm_files_built_ph = $(glibmm_files_hg:%.hg=private/%_p.h) +glibmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(glibmm_files_hg)) glibmm_files_extra_cc = \ class.cc \ |