mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Original commit message from CVS:
use glib-gen.mak
fix Makefile.am bugs and clean them up
This commit is contained in:
Thomas Vander Stichele 2004-02-03 16:49:54 +00:00
parent 4a935663bf
commit b5e2e40645
20 changed files with 95 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -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):

2
common

@ -1 +1 @@
Subproject commit ab32709acc23a4a1b458823fd094327332408035
Subproject commit 0f9fe900b0757fd2450454a1af24146b47aaaac2

4
gst-libs/gst/colorbalance/.gitignore vendored
View file

@ -1,2 +1,2 @@
colorbalanceenumtypes.[ch]
colorbalancemarshal.[ch]
colorbalance-enumtypes.[ch]
colorbalance-marshal.[ch]

49
gst-libs/gst/colorbalance/Makefile.am
View file

@ -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

0
gst-libs/gst/colorbalance/colorbalancemarshal.list → gst-libs/gst/colorbalance/colorbalance-marshal.list
View file

2
gst-libs/gst/colorbalance/colorbalance.c
View file

@ -25,7 +25,7 @@
#endif
#include "colorbalance.h"
#include "colorbalancemarshal.h"
#include "colorbalance-marshal.h"
enum {
VALUE_CHANGED,

2
gst-libs/gst/colorbalance/colorbalance.h
View file

@ -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

4
gst-libs/gst/mixer/.gitignore vendored
View file

@ -1,2 +1,2 @@
mixerenumtypes.[ch]
mixermarshal.[ch]
mixer-enumtypes.[ch]
mixer-marshal.[ch]

51
gst-libs/gst/mixer/Makefile.am
View file

@ -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

0
gst-libs/gst/mixer/mixermarshal.list → gst-libs/gst/mixer/mixer-marshal.list
View file

2
gst-libs/gst/mixer/mixer.c
View file

@ -24,7 +24,7 @@
#endif
#include "mixer.h"
#include "mixermarshal.h"
#include "mixer-marshal.h"
enum {
MUTE_TOGGLED,

2
gst-libs/gst/mixer/mixer.h
View file

@ -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

2
gst-libs/gst/play/.gitignore vendored
View file

@ -1 +1 @@
playenumtypes.[ch]
play-enumtypes.[ch]

31
gst-libs/gst/play/Makefile.am
View file

@ -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

2
gst-libs/gst/play/play.h
View file

@ -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 */

4
gst-libs/gst/tuner/.gitignore vendored
View file

@ -1,2 +1,2 @@
tunerenumtypes.[ch]
tunermarshal.[ch]
tuner-enumtypes.[ch]
tuner-marshal.[ch]

48
gst-libs/gst/tuner/Makefile.am
View file

@ -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

0
gst-libs/gst/tuner/tunermarshal.list → gst-libs/gst/tuner/tuner-marshal.list
View file

2
gst-libs/gst/tuner/tuner.c
View file

@ -24,7 +24,7 @@
#endif
#include "tuner.h"
#include "tunermarshal.h"
#include "tuner-marshal.h"
#include <string.h>

2
gst-libs/gst/tuner/tuner.h
View file

@ -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