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 /glib/glibmm/filelist.am | |
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.
Diffstat (limited to 'glib/glibmm/filelist.am')
-rw-r--r-- | glib/glibmm/filelist.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |