use glib-gen.mak fix Makefile.am bugs and clean them up

Original commit message from CVS:
use glib-gen.mak
fix Makefile.am bugs and clean them up

5 files changed, 19 insertions, 38 deletions

diff --git a/gst-libs/gst/colorbalance/.gitignore b/gst-libs/gst/colorbalance/.gitignore
index 533e6670..8a465f35 100644
--- a/gst-libs/gst/colorbalance/.gitignore
+++ b/gst-libs/gst/colorbalance/.gitignore
@@ -1,2 +1,2 @@
-colorbalanceenumtypes.[ch]
-colorbalancemarshal.[ch]
+colorbalance-enumtypes.[ch]
+colorbalance-marshal.[ch]
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index d2aee92c..2571f44b 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -1,3 +1,9 @@
+# variables used for enum/marshal generation
+glib_enum_headers=$(colorbalance_headers)
+glib_enum_define=GST_COLOR_BALANCE
+glib_root=colorbalance
+glib_enum_prefix=gst_color_balance
+
 libgstcolorbalanceincludedir = \
 	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance
 
@@ -6,8 +12,8 @@ colorbalance_headers = \
 	colorbalancechannel.h
 
 built_headers =	\
-	colorbalancemarshal.h
-	colorbalanceenumtypes.h
+	$(glib_root)-marshal.h \
+	$(glib_root)-enumtypes.h
 
 libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) $(built_headers)
 
@@ -16,42 +22,17 @@ noinst_LTLIBRARIES = libgstcolorbalance.la
 libgstcolorbalance_la_SOURCES = \
 	colorbalance.c \
 	colorbalancechannel.c \
-	colorbalancemarshal.c \
-	colorbalanceenumtypes.c
+	$(glib_root)-marshal.c \
+	$(glib_root)-enumtypes.c
 libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
 
 BUILT_SOURCES = \
-	colorbalancemarshal.c \
-	colorbalancemarshal.h \
-	colorbalanceenumtypes.c \
-	colorbalanceenumtypes.h
+	$(glib_root)-marshal.c \
+	$(glib_root)-enumtypes.c \
+        $(built_headers)
 
-EXTRA_DIST = colorbalancemarshal.list
+EXTRA_DIST = $(glib_root)-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-colorbalancemarshal.h: colorbalancemarshal.list
-	glib-genmarshal --header --prefix=gst_color_balance_marshal $^ > colorbalancemarshal.h.tmp
-	mv colorbalancemarshal.h.tmp colorbalancemarshal.h
-
-colorbalancemarshal.c: colorbalancemarshal.list
-	echo "#include \"colorbalancemarshal.h\"" >> colorbalancemarshal.c.tmp
-	glib-genmarshal --body --prefix=gst_color_balance_marshal $^ >> colorbalancemarshal.c.tmp
-	mv colorbalancemarshal.c.tmp colorbalancemarshal.c
-
-colorbalanceenumtypes.h: $(colorbalance_headers)
-	glib-mkenums \
-	--fhead "#ifndef __GST_COLOR_BALANCE_ENUM_TYPES_H__\n#define __GST_COLOR_BALANCE_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-	--fprod "/* enumerations from \"@filename@\" */\n" \
-	--vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
-	--ftail "G_END_DECLS\n\n#endif /* __GST_COLOR_BALANCE_ENUM_TYPES_H__ */" \
-	$^ > $@
-
-colorbalanceenumtypes.c: $(colorbalance_headers)
-	glib-mkenums \
-	--fhead "#include <colorbalance.h>" \
-	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-	$^ > $@
+include $(top_srcdir)/common/glib-gen.mak
diff --git a/gst-libs/gst/colorbalance/colorbalancemarshal.list b/gst-libs/gst/colorbalance/colorbalance-marshal.list
index b9d0c499..b9d0c499 100644
--- a/gst-libs/gst/colorbalance/colorbalancemarshal.list
+++ b/gst-libs/gst/colorbalance/colorbalance-marshal.list
diff --git a/gst-libs/gst/colorbalance/colorbalance.c b/gst-libs/gst/colorbalance/colorbalance.c
index 272b7eb9..7e8cec9b 100644
--- a/gst-libs/gst/colorbalance/colorbalance.c
+++ b/gst-libs/gst/colorbalance/colorbalance.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "colorbalance.h"
-#include "colorbalancemarshal.h"
+#include "colorbalance-marshal.h"
 
 enum {
   VALUE_CHANGED,
diff --git a/gst-libs/gst/colorbalance/colorbalance.h b/gst-libs/gst/colorbalance/colorbalance.h
index 1d3cba6a..d7b92171 100644
--- a/gst-libs/gst/colorbalance/colorbalance.h
+++ b/gst-libs/gst/colorbalance/colorbalance.h
@@ -24,7 +24,7 @@
 
 #include <gst/gst.h>
 #include <gst/colorbalance/colorbalancechannel.h>
-#include <gst/colorbalance/colorbalanceenumtypes.h>
+#include <gst/colorbalance/colorbalance-enumtypes.h>
 
 G_BEGIN_DECLS