[farsight2/master] Auto-generate fsrtpconference marshaller list

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


---
 gst/fsrtpconference/Makefile.am         |   16 +++++++++++++---
 gst/fsrtpconference/fs-rtp-marshal.list |    3 ---
 2 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 100644 gst/fsrtpconference/fs-rtp-marshal.list

diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index 0cf7071..732380d 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -35,9 +35,7 @@ noinst_HEADERS = \
 	fs-rtp-dtmf-sound-source.h \
 	fs-rtp-marshal.h
 
-EXTRA_libfsrtpconference_la_SOURCES = fs-rtp-marshal.list
-
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) fs-rtp-marshal.list
 
 libfsrtpconference_la_CFLAGS = \
 	$(FS2_INTERNAL_CFLAGS) \
@@ -67,6 +65,18 @@ gstfsrtpconference_doc.c: gstfsrtpconference.c
 BUILT_SOURCES += gstfsrtpconference_doc.c
 endif
 
+fs-rtp-marshal.list: $(libfsrtpconference_la_SOURCES) Makefile.am
+	( cd $(srcdir) && \
+	sed -n -e 's/.*fs_rtp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+	$(libfsrtpconference_la_SOURCES) ) \
+	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+	if cmp -s $@.tmp $@; then \
+		rm $@.tmp; \
+		touch $@; \
+	else \
+		mv $@.tmp $@; \
+	fi
+
 fs-rtp-marshal.h: fs-rtp-marshal.list Makefile
 		glib-genmarshal --header --prefix=_fs_rtp_marshal $(srcdir)/$< > $@.tmp
 		mv $@.tmp $@
diff --git a/gst/fsrtpconference/fs-rtp-marshal.list b/gst/fsrtpconference/fs-rtp-marshal.list
deleted file mode 100644
index f7d1e71..0000000
--- a/gst/fsrtpconference/fs-rtp-marshal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-VOID:BOXED,BOXED
-VOID:INT,STRING,STRING
-POINTER:BOXED
-- 
1.5.6.5




More information about the farsight-commits mailing list