[farsight2/master] Have fs-rtp-* use the generic marshaller generator

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:25:54 PST 2008


---
 gst/fsrtpconference/Makefile.am |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index 732380d..91ac2f9 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -77,12 +77,7 @@ fs-rtp-marshal.list: $(libfsrtpconference_la_SOURCES) Makefile.am
 		mv $@.tmp $@; \
 	fi
 
-fs-rtp-marshal.h: fs-rtp-marshal.list Makefile
-		glib-genmarshal --header --prefix=_fs_rtp_marshal $(srcdir)/$< > $@.tmp
-		mv $@.tmp $@
+glib_enum_define=FS_RTP
+glib_enum_prefix=_fs_rtp
 
-fs-rtp-marshal.c: fs-rtp-marshal.list Makefile
-		echo "#include \"glib-object.h\"" >> $@.tmp
-		echo "#include \"fs-rtp-marshal.h\"" >> $@.tmp
-		glib-genmarshal --body --prefix=_fs_rtp_marshal $(srcdir)/$< >> $@.tmp
-		mv $@.tmp $@
+include $(top_srcdir)/common/glib-gen.mak
-- 
1.5.6.5




More information about the farsight-commits mailing list