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

diff --git a/ChangeLog b/ChangeLog
index abc6604a09805c26aab67ece269644f573a09c69..d0b0e083956f3d41af537576a3df453de37b9672 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-02-03  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst-libs/gst/colorbalance/Makefile.am:
+       * gst-libs/gst/colorbalance/colorbalance-marshal.list:
+       * gst-libs/gst/colorbalance/colorbalance.c:
+       * gst-libs/gst/colorbalance/colorbalance.h:
+       * gst-libs/gst/colorbalance/colorbalancemarshal.list:
+       * gst-libs/gst/mixer/Makefile.am:
+       * gst-libs/gst/mixer/mixer-marshal.list:
+       * gst-libs/gst/mixer/mixer.c:
+       * gst-libs/gst/mixer/mixer.h:
+       * gst-libs/gst/mixer/mixermarshal.list:
+       * gst-libs/gst/play/Makefile.am:
+       * gst-libs/gst/play/play.h:
+       * gst-libs/gst/tuner/Makefile.am:
+       * gst-libs/gst/tuner/tuner-marshal.list:
+       * gst-libs/gst/tuner/tuner.c:
+       * gst-libs/gst/tuner/tuner.h:
+       * gst-libs/gst/tuner/tunermarshal.list:
+          use new glib-gen.mak snippet to clean up Makefile.am
+          fix various bugs in Makefile.am's
+
 2004-02-03  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
        * ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain):

diff --git a/common b/common
index ab32709acc23a4a1b458823fd094327332408035..0f9fe900b0757fd2450454a1af24146b47aaaac2 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ab32709acc23a4a1b458823fd094327332408035
+Subproject commit 0f9fe900b0757fd2450454a1af24146b47aaaac2

diff --git a/gst-libs/gst/colorbalance/.gitignore b/gst-libs/gst/colorbalance/.gitignore
index 533e667010ab30ae06915755a607dc171370f66e..8a465f35d7f1b12bf215a0ff2833e493a18eb468 100644 (file)
--- 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 d2aee92c7731cec7f5e5bba358fa6564e074593a..2571f44b42bcde3cc8c57257dd6f947008e318e5 100644 (file)
--- 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
similarity index 100%
rename from gst-libs/gst/colorbalance/colorbalancemarshal.list
rename to gst-libs/gst/colorbalance/colorbalance-marshal.list

diff --git a/gst-libs/gst/colorbalance/colorbalance.c b/gst-libs/gst/colorbalance/colorbalance.c
index 272b7eb990e30dcc2c2e85d1a216f2ff4a803e30..7e8cec9bf3856739f637c5467e75900e0bde6b59 100644 (file)
--- 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 1d3cba6a68826b60955b25156aaef5c6e9f87e9d..d7b92171cede0d205d184fabf733a352314b6408 100644 (file)
--- 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
 

diff --git a/gst-libs/gst/mixer/.gitignore b/gst-libs/gst/mixer/.gitignore
index 968ea36b096f5250e1b5f4d7b6e9a9a7bb91aeaf..de8511317391ca4a7b6c6dfb8d774782966b9898 100644 (file)
--- a/gst-libs/gst/mixer/.gitignore
+++ b/gst-libs/gst/mixer/.gitignore
@@ -1,2 +1,2 @@
-mixerenumtypes.[ch]
-mixermarshal.[ch]
+mixer-enumtypes.[ch]
+mixer-marshal.[ch]

diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index 7871a24d7ae2479a0ab95f8c0930206bfad88be4..7c52dda6cdc107edd3643a439f0e1e4a5e0fcddc 100644 (file)
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -1,3 +1,10 @@
+# variables used for enum/marshal generation
+glib_enum_headers=$(mixer_headers)
+glib_enum_define=GST_MIXER
+glib_root=mixer
+glib_enum_prefix=gst_mixer
+
+
 libgstmixerincludedir = \
        $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/mixer
 
@@ -6,8 +13,8 @@ mixer_headers = \
        mixertrack.h
 
 built_headers =        \
-       mixermarshal.h \
-       mixerenumtypes.h
+       $(glib_root)-marshal.h \
+       $(glib_root)-enumtypes.h
 
 libgstmixerinclude_HEADERS = $(mixer_headers) $(built_headers)
 
@@ -16,42 +23,18 @@ noinst_LTLIBRARIES = libgstmixer.la
 libgstmixer_la_SOURCES = \
        mixer.c \
        mixertrack.c \
-       mixermarshal.c \
-       mixerenumtypes.c
+       $(glib_root)-marshal.c \
+       $(glib_root)-enumtypes.c
+
 libgstmixer_la_CFLAGS = $(GST_CFLAGS)
 
 BUILT_SOURCES = \
-       mixermarshal.c \
-       mixermarshal.h \
-       mixerenumtypes.c \
-       mixerenumtypes.h
+       $(glib_root)-marshal.c \
+       $(glib_root)-enumtypes.c \
+        $(built_headers)
 
-EXTRA_DIST = mixermarshal.list
+EXTRA_DIST = mixer-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-mixermarshal.h: mixermarshal.list
-       glib-genmarshal --header --prefix=gst_mixer_marshal $^ > mixermarshal.h.tmp
-       mv mixermarshal.h.tmp mixermarshal.h
-
-mixermarshal.c: mixermarshal.list
-       echo "#include \"mixermarshal.h\"" >> mixermarshal.c.tmp
-       glib-genmarshal --body --prefix=gst_mixer_marshal $^ >> mixermarshal.c.tmp
-       mv mixermarshal.c.tmp mixermarshal.c
-
-mixerenumtypes.h: $(mixer_headers)
-       glib-mkenums \
-       --fhead "#ifndef __GST_MIXER_ENUM_TYPES_H__\n#define __GST_MIXER_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_MIXER_ENUM_TYPES_H__ */" \
-       $^ > $@
-
-mixerenumtypes.c: $(mixer_headers)
-       glib-mkenums \
-       --fhead "#include <mixer.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/mixer/mixermarshal.list b/gst-libs/gst/mixer/mixer-marshal.list
similarity index 100%
rename from gst-libs/gst/mixer/mixermarshal.list
rename to gst-libs/gst/mixer/mixer-marshal.list

diff --git a/gst-libs/gst/mixer/mixer.c b/gst-libs/gst/mixer/mixer.c
index b0a9465d52e1b87d15d1ed8beaac438718283390..f58bcb2c4eac9b93e269748a8b4791451981568f 100644 (file)
--- a/gst-libs/gst/mixer/mixer.c
+++ b/gst-libs/gst/mixer/mixer.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "mixer.h"
-#include "mixermarshal.h"
+#include "mixer-marshal.h"
 
 enum {
   MUTE_TOGGLED,

diff --git a/gst-libs/gst/mixer/mixer.h b/gst-libs/gst/mixer/mixer.h
index bbfe1c7509162423634fad4cf66e3d9ef0e72dd0..50ba3fd835adfff93078e9ca4182811c55d5888c 100644 (file)
--- a/gst-libs/gst/mixer/mixer.h
+++ b/gst-libs/gst/mixer/mixer.h
@@ -24,7 +24,7 @@
 
 #include <gst/gst.h>
 #include <gst/mixer/mixertrack.h>
-#include <gst/mixer/mixerenumtypes.h>
+#include <gst/mixer/mixer-enumtypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gst-libs/gst/play/.gitignore b/gst-libs/gst/play/.gitignore
index fcb0f7c45c7fbe8d495da8cb33a3b218dd364d93..02277ef5f1c8bbdea5975fc67018d2c37ae48fa0 100644 (file)
--- a/gst-libs/gst/play/.gitignore
+++ b/gst-libs/gst/play/.gitignore
@@ -1 +1 @@
-playenumtypes.[ch]
+play-enumtypes.[ch]

diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index 58728f1dae0d63c2c7e335c2917f64bc21721f54..17460384d6b3cf8f0f479d85288bba2d9e427fc8 100644 (file)
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -1,14 +1,20 @@
+# variables used for enum generation
+glib_enum_headers=$(play_headers)
+glib_enum_define=GST_PLAY
+glib_root=play
+glib_enum_prefix=gst_play
+
 librarydir = $(libdir)
 
 play_headers = \
        play.h
 
 built_headers = \
-       playenumtypes.h
+       $(glib_root)-enumtypes.h
 
 library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
 
-libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c playenumtypes.c
+libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c $(glib_root)-enumtypes.c
 
 libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play
 libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
@@ -22,24 +28,9 @@ libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = \
                -version-info @GST_PLUGINS_LIBVERSION@
 
 BUILT_SOURCES = \
-       playenumtypes.c \
-       playenumtypes.h
+       $(glib_root)-enumtypes.c \
+       $(built_headers)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-playenumtypes.h: $(play_headers)
-       glib-mkenums \
-       --fhead "#ifndef __GST_PLAY_ENUM_TYPES_H__\n#define __GST_PLAY_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_PLAY_ENUM_TYPES_H__ */" \
-       $^ > $@
-
-playenumtypes.c: $(play_headers)
-       glib-mkenums \
-       --fhead "#include <play.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/play/play.h b/gst-libs/gst/play/play.h
index 2701036c96676b4854a17c35ace68854e14997e5..8ccf827d79575d53b9b15e762c4b58064f1e7b7c 100644 (file)
--- a/gst-libs/gst/play/play.h
+++ b/gst-libs/gst/play/play.h
@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/xoverlay/xoverlay.h>
-#include <gst/play/playenumtypes.h>
+#include <gst/play/play-enumtypes.h>
 
 /* GError stuff */
 

diff --git a/gst-libs/gst/tuner/.gitignore b/gst-libs/gst/tuner/.gitignore
index 9052893ac945b747cf392a7b04fff9f8e340984e..cd5f805beb2326ad0cc4f8fc2d81d4158d8bc9ef 100644 (file)
--- a/gst-libs/gst/tuner/.gitignore
+++ b/gst-libs/gst/tuner/.gitignore
@@ -1,2 +1,2 @@
-tunerenumtypes.[ch]
-tunermarshal.[ch]
+tuner-enumtypes.[ch]
+tuner-marshal.[ch]

diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index c4020a4b6babb83e15ebc3495e33630ae8d494d4..af1020faae1e37068bc58511339459b76f76aa43 100644 (file)
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -1,3 +1,9 @@
+# variables used for enum/marshal generation
+glib_enum_headers=$(tuner_headers)
+glib_enum_define=GST_TUNER
+glib_root=tuner
+glib_enum_prefix=gst_tuner
+
 libgsttunerincludedir = \
        $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tuner
 
@@ -7,8 +13,8 @@ tuner_headers = \
        tunerchannel.h
 
 built_headers =        \
-       tunermarshal.h
-       tunerenumtypes.h
+       $(glib_root)-marshal.h \
+       $(glib_root)-enumtypes.h
 
 libgsttunerinclude_HEADERS = $(tuner_headers) $(built_headers)
 
@@ -18,41 +24,17 @@ libgsttuner_la_SOURCES = \
        tuner.c \
        tunernorm.c \
        tunerchannel.c \
-       tunermarshal.c
+       $(glib_root)-marshal.c
+
 libgsttuner_la_CFLAGS = $(GST_CFLAGS)
 
 BUILT_SOURCES = \
-       tunermarshal.c \
-       tunermarshal.h \
-       tunerenumtypes.c \
-       tunerenumtypes.h
+       $(glib_root)-marshal.c \
+       $(glib_root)-enumtypes.c \
+       $(built_headers)
 
-EXTRA_DIST = tunermarshal.list
+EXTRA_DIST = $(glib_root)-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-tunermarshal.h: tunermarshal.list
-       glib-genmarshal --header --prefix=gst_tuner_marshal $^ > tunermarshal.h.tmp
-       mv tunermarshal.h.tmp tunermarshal.h
-
-tunermarshal.c: tunermarshal.list
-       echo "#include \"tunermarshal.h\"" >> tunermarshal.c.tmp
-       glib-genmarshal --body --prefix=gst_tuner_marshal $^ >> tunermarshal.c.tmp
-       mv tunermarshal.c.tmp tunermarshal.c
-
-tunerenumtypes.h: $(tuner_headers)
-       glib-mkenums \
-       --fhead "#ifndef __GST_TUNER_ENUM_TYPES_H__\n#define __GST_TUNER_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_TUNER_ENUM_TYPES_H__ */" \
-       $^ > $@
-
-tunerenumtypes.c: $(tuner_headers)
-       glib-mkenums \
-       --fhead "#include <tuner.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/tuner/tunermarshal.list b/gst-libs/gst/tuner/tuner-marshal.list
similarity index 100%
rename from gst-libs/gst/tuner/tunermarshal.list
rename to gst-libs/gst/tuner/tuner-marshal.list

diff --git a/gst-libs/gst/tuner/tuner.c b/gst-libs/gst/tuner/tuner.c
index 471fc5d2ed16a3cc396f32d5435af71d789fbd18..54bab86388bd1ed1d530d06e11b5ab8917ed95f6 100644 (file)
--- a/gst-libs/gst/tuner/tuner.c
+++ b/gst-libs/gst/tuner/tuner.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "tuner.h"
-#include "tunermarshal.h"
+#include "tuner-marshal.h"
 
 #include <string.h>
 

diff --git a/gst-libs/gst/tuner/tuner.h b/gst-libs/gst/tuner/tuner.h
index c4c45c65ec5608651aa9093768641112a01d88d6..8c935389c9b504f40e6b0900f687d3716b10e013 100644 (file)
--- a/gst-libs/gst/tuner/tuner.h
+++ b/gst-libs/gst/tuner/tuner.h
@@ -25,7 +25,7 @@
 #include <gst/gst.h>
 #include <gst/tuner/tunernorm.h>
 #include <gst/tuner/tunerchannel.h>
-#include <gst/tuner/tunerenumtypes.h>
+#include <gst/tuner/tuner-enumtypes.h>
 
 G_BEGIN_DECLS