diff options
20 files changed, 94 insertions, 135 deletions
@@ -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 -Subproject ab32709acc23a4a1b458823fd09432733240803 +Subproject 0f9fe900b0757fd2450454a1af24146b47aaaac 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 diff --git a/gst-libs/gst/mixer/.gitignore b/gst-libs/gst/mixer/.gitignore index 968ea36b..de851131 100644 --- 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 7871a24d..7c52dda6 100644 --- 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 index ac2cd6b8..ac2cd6b8 100644 --- a/gst-libs/gst/mixer/mixermarshal.list +++ b/gst-libs/gst/mixer/mixer-marshal.list diff --git a/gst-libs/gst/mixer/mixer.c b/gst-libs/gst/mixer/mixer.c index b0a9465d..f58bcb2c 100644 --- 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 bbfe1c75..50ba3fd8 100644 --- 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 fcb0f7c4..02277ef5 100644 --- 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 58728f1d..17460384 100644 --- 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 2701036c..8ccf827d 100644 --- 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 9052893a..cd5f805b 100644 --- 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 c4020a4b..af1020fa 100644 --- 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 index c99ddc7d..c99ddc7d 100644 --- a/gst-libs/gst/tuner/tunermarshal.list +++ b/gst-libs/gst/tuner/tuner-marshal.list diff --git a/gst-libs/gst/tuner/tuner.c b/gst-libs/gst/tuner/tuner.c index 471fc5d2..54bab863 100644 --- 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 c4c45c65..8c935389 100644 --- 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 |