[empathy: 33/99] Don't use wildcards for just one marshal file



commit 15bc6e462986ae39f8a2880b60274be9b8d45114
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Wed Feb 23 10:42:23 2011 +0000

    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

 libempathy/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index e6acc64..332e8dd 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



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