[farsight2/master] Replace multiple copies of marshaller/enums generator with gst version

[Olivier Crête]

---
 gst-libs/gst/farsight/Makefile.am |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 101cd70..6b874c6 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -58,16 +58,6 @@ fs-marshal.list: $(libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES) Makefile.am
 		mv $@.tmp $@; \
 	fi
 
-fs-marshal.h: Makefile fs-marshal.list
-		glib-genmarshal --header --prefix=_fs_marshal $(builddir)/fs-marshal.list > fs-marshal.h.tmp
-		mv fs-marshal.h.tmp fs-marshal.h
-
-fs-marshal.c: Makefile fs-marshal.list
-		echo "#include \"glib-object.h\"" >> fs-marshal.c.tmp
-		echo "#include \"fs-marshal.h\"" >> fs-marshal.c.tmp
-		glib-genmarshal --body --prefix=_fs_marshal $(builddir)/fs-marshal.list >> fs-marshal.c.tmp
-		mv fs-marshal.c.tmp fs-marshal.c
-
 libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = \
 	$(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
@@ -89,19 +79,8 @@ public_headers = fs-candidate.h \
 		fs-stream.h \
 		fs-conference-iface.h
 
-fs-enum-types.h: $(public_headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
-			--fhead "#ifndef __FS_ENUM_TYPES_H__\n#define __FS_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name at _get_type (void);\n#define FS_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" 	\
-			--ftail "G_END_DECLS\n\n#endif /* __FS_ENUM_TYPES_H__ */" \
-		$(public_headers) ) > fs-enum-types.h
+glib_enum_headers=$(public_headers)
+glib_enum_define=FS
+glib_enum_prefix=_fs
 
-fs-enum-types.c: $(public_headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
-			--fhead "#include <fs-conference-iface.h>\n#include <fs-enum-types.h>" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {" 	\
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(public_headers) ) > fs-enum-types.c
+include $(top_srcdir)/common/glib-gen.mak
-- 
1.5.6.5