aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/Makefile.am
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-23 18:42:23 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:05 +0800
commit15bc6e462986ae39f8a2880b60274be9b8d45114 (patch)
tree69ace8b0a3e9d41095138b128be86c048041c4c3 /libempathy/Makefile.am
parentd871bf3cfa46354371d6f99d1a5f182761313d71 (diff)
downloadgsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar.gz
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar.bz2
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar.lz
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar.xz
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.tar.zst
gsoc2013-empathy-15bc6e462986ae39f8a2880b60274be9b8d45114.zip
Don't use wildcards for just one marshal file
When a build is triggered from a location that isn't the top build dir, the generated files break as the wrong prefix gets passed for some reason. Given we only create one -marshal file, being smart doesn't actually save us anything, so do things the simple way
Diffstat (limited to 'libempathy/Makefile.am')
-rw-r--r--libempathy/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index e6acc648d..332e8dd5b 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -134,12 +134,12 @@ empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
mv $@.tmp $@; \
fi
-%-marshal.h: %-marshal.list Makefile
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+empathy-marshal.h: empathy-marshal.list Makefile
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_empathy_marshal $< > empathy-marshal.h
-%-marshal.c: %-marshal.list Makefile
+empathy-marshal.c: empathy-marshal.list Makefile
$(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+ $(GLIB_GENMARSHAL) --body --prefix=_empathy_marshal $< >> empathy-marshal.c
empathy-enum-types.h: stamp-empathy-enum-types.h
$(AM_V_GEN)true