summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common-modified/glib-gen.mak44
-rw-r--r--gst-libs/gst/farsight/Makefile.am16
-rw-r--r--gst-libs/gst/farsight/fs-participant.c2
-rw-r--r--gst-libs/gst/farsight/fs-session.c2
-rw-r--r--gst-libs/gst/farsight/fs-stream.c2
-rw-r--r--gst/fsmsnconference/Makefile.am2
-rw-r--r--gst/fsrtpconference/Makefile.am11
-rw-r--r--gst/rtcpfilter/Makefile.am10
-rw-r--r--transmitters/rawudp/Makefile.am9
9 files changed, 27 insertions, 71 deletions
diff --git a/common-modified/glib-gen.mak b/common-modified/glib-gen.mak
deleted file mode 100644
index 66ae82b5..00000000
--- a/common-modified/glib-gen.mak
+++ /dev/null
@@ -1,44 +0,0 @@
-# these are the variables your Makefile.am should set
-# the example is based on the colorbalance interface
-
-#glib_enum_headers=$(colorbalance_headers)
-#glib_enum_define=GST_COLOR_BALANCE
-#glib_enum_prefix=gst_color_balance
-
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-
-# these are all the rules generating the relevant files
-%-marshal.h: %-marshal.list Makefile
- glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $< > $*-marshal.h.tmp
- mv $*-marshal.h.tmp $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
- echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp
- glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $< >> $*-marshal.c.tmp
- mv $*-marshal.c.tmp $*-marshal.c
-
-%-enum-types.h: $(glib_enum_headers) Makefile
- glib-mkenums \
- --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "\n/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define $(glib_enum_define)_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \
- $^ > $@
-
-%-enum-types.c: $(glib_enum_headers) Makefile
- @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
- glib-mkenums \
- --fhead "#include \"$*-enum-types.h\"\n$(enum_headers)" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" \
- $^ > $@
-
-# a hack rule to make sure .Plo files exist because they get include'd
-# from Makefile's
-.deps/%-marshal.Plo:
- touch $@
-
-.deps/%-enum-types.Plo:
- touch $@
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 32ff5be2..e2c0e3eb 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -17,6 +17,9 @@ libgstfarsightinclude_HEADERS = \
nodist_libgstfarsightinclude_HEADERS = \
fs-enum-types.h
+# Don't forget to rename on ABI break
+fs-enum-types.h: fs-enumtypes.h
+ $(AM_V_GEN)$(LN_S) fs-enumtypes.h fs-enum-types.h
lib_LTLIBRARIES = libgstfarsight-@GST_MAJORMINOR@.la
@@ -24,7 +27,7 @@ BUILT_SOURCES = \
$(nodist_libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) \
$(nodist_libgstfarsightinclude_HEADERS)
-CLEANFILES = $(BUILT_SOURCES) fs-marshal.list
+CLEANFILES = $(BUILT_SOURCES) fs-enumtypes.h fs-marshal.list
libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
fs-base-conference.c \
@@ -44,15 +47,15 @@ libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
nodist_libgstfarsight_@GST_MAJORMINOR@_la_SOURCES = \
fs-marshal.c \
fs-marshal.h \
- fs-enum-types.c
+ fs-enumtypes.c
fs-marshal.list: $(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) Makefile.am
- ( cd $(srcdir) && \
+ $(AM_V_GEN) ( cd $(srcdir) && \
sed -n -e 's/.*_fs_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(libgstfarsight_@GST_MAJORMINOR@_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
+ @if cmp -s $@.tmp $@; then \
rm $@.tmp; \
touch $@; \
else \
@@ -82,6 +85,7 @@ public_headers = fs-candidate.h \
glib_enum_headers=$(public_headers)
glib_enum_define=FS
-glib_enum_prefix=_fs
+glib_gen_prefix=_fs
+glib_gen_basename=fs
-include $(top_srcdir)/common-modified/glib-gen.mak
+include $(top_srcdir)/common-modified/gst-glib-gen.mak
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index 195d80f3..5ae972ee 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -37,7 +37,7 @@
#endif
#include "fs-participant.h"
-#include "fs-enum-types.h"
+#include "fs-enumtypes.h"
#include "fs-marshal.h"
/* Signals */
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index f5f95061..ac82eab8 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -82,7 +82,7 @@
#include "fs-conference-iface.h"
#include "fs-codec.h"
#include "fs-marshal.h"
-#include "fs-enum-types.h"
+#include "fs-enumtypes.h"
#include "fs-private.h"
#define GST_CAT_DEFAULT fs_base_conference_debug
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index a50ae4fd..2110168c 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -110,7 +110,7 @@
#include "fs-candidate.h"
#include "fs-stream-transmitter.h"
#include "fs-conference-iface.h"
-#include "fs-enum-types.h"
+#include "fs-enumtypes.h"
#include "fs-private.h"
/* Signals */
diff --git a/gst/fsmsnconference/Makefile.am b/gst/fsmsnconference/Makefile.am
index c9f364b3..aac29057 100644
--- a/gst/fsmsnconference/Makefile.am
+++ b/gst/fsmsnconference/Makefile.am
@@ -56,7 +56,7 @@ nodist_libfsmsnconference_doc_la_SOURCES = \
libfsmsnconference_doc_la_LIBADD = $(libfsmsnconference_la_LIBADD)
%.doc.c: %.c
- sed -e 's:GST_PLUGIN_DEFINE:GST_PLUGIN_DEFINE_STATIC:' $< > $@
+ $(AM_V_GEN)sed -e 's:GST_PLUGIN_DEFINE:GST_PLUGIN_DEFINE_STATIC:' $< > $@
BUILT_SOURCES = $(nodist_libfsmsnconference_doc_la_SOURCES)
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index b582cf3a..9ea4466a 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -71,7 +71,7 @@ nodist_libfsrtpconference_doc_la_SOURCES = \
libfsrtpconference_doc_la_LIBADD = $(libfsrtpconference_la_LIBADD)
%.doc.c: %.c
- sed -e 's:GST_PLUGIN_DEFINE:GST_PLUGIN_DEFINE_STATIC:' $< > $@
+ $(AM_V_GEN)sed -e 's:GST_PLUGIN_DEFINE:GST_PLUGIN_DEFINE_STATIC:' $< > $@
BUILT_SOURCES += fs-rtp-conference-plugin.doc.c
endif
@@ -79,11 +79,11 @@ endif
# Build the build sources
fs-rtp-marshal.list: $(libfsrtpconference_convenience_la_SOURCES) Makefile.am
- ( cd $(srcdir) && \
+ $(AM_V_GEN)( cd $(srcdir) && \
sed -n -e 's/.*fs_rtp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(libfsrtpconference_convenience_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
+ @if cmp -s $@.tmp $@; then \
rm $@.tmp; \
touch $@; \
else \
@@ -91,6 +91,7 @@ fs-rtp-marshal.list: $(libfsrtpconference_convenience_la_SOURCES) Makefile.am
fi
glib_enum_define=FS_RTP
-glib_enum_prefix=_fs_rtp
+glib_gen_prefix=_fs_rtp
+glib_gen_basename=fs-rtp
-include $(top_srcdir)/common-modified/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
diff --git a/gst/rtcpfilter/Makefile.am b/gst/rtcpfilter/Makefile.am
index abd2f568..92fdfe1a 100644
--- a/gst/rtcpfilter/Makefile.am
+++ b/gst/rtcpfilter/Makefile.am
@@ -20,19 +20,13 @@ libfsrtcpfilter_la_LIBADD = \
fs-rtcp-filter-marshal.list: $(libfsrtcpfilter_la_SOURCES) Makefile.am
- ( cd $(srcdir) && \
+ $(AM_V_GEN)( cd $(srcdir) && \
sed -n -e 's/.*fs_rtcp-filter_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(libfsrtcpfilter_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
+ @if cmp -s $@.tmp $@; then \
rm $@.tmp; \
touch $@; \
else \
mv $@.tmp $@; \
fi
-
-glib_enum_define=FS_RTCP_FILTER
-glib_enum_prefix=_fs_rtcp_filter
-
-include $(top_srcdir)/common-modified/glib-gen.mak
-
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 392d7830..861ecf40 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -43,11 +43,11 @@ CLEANFILES = $(BUILT_SOURCES) fs-rawudp-marshal.list
fs-rawudp-marshal.list: $(librawudp_transmitter_la_SOURCES) Makefile.am
- ( cd $(srcdir) && \
+ $(AM_V_GEN)( cd $(srcdir) && \
sed -n -e 's/.*_fs_rawudp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(librawudp_transmitter_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
+ @if cmp -s $@.tmp $@; then \
rm $@.tmp; \
touch $@; \
else \
@@ -55,7 +55,8 @@ fs-rawudp-marshal.list: $(librawudp_transmitter_la_SOURCES) Makefile.am
fi
glib_enum_define=FS_RAWUDP
-glib_enum_prefix=_fs_rawudp
+glib_gen_prefix=_fs_rawudp
+glib_gen_basename=fs-rawudp
-include $(top_srcdir)/common-modified/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
View Lorry Controller Status