summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-03 20:20:07 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-03 20:20:07 +0000
commit47be812c27b5d8ecc37a1a89eec18a1e33dc9320 (patch)
treee4e017a021025a1bdf95d67abca2b8913fe6f5b7
parent4c0511c1dfe5915c3d2395fd754ad13c6a278f49 (diff)
downloadgst-plugins-bad-47be812c27b5d8ecc37a1a89eec18a1e33dc9320.tar.gz
gst-plugins-bad-47be812c27b5d8ecc37a1a89eec18a1e33dc9320.tar.bz2
gst-plugins-bad-47be812c27b5d8ecc37a1a89eec18a1e33dc9320.zip
remove glib_root add hack rule for .Plo files
Original commit message from CVS: remove glib_root add hack rule for .Plo files
-rw-r--r--ChangeLog10
m---------common0
-rw-r--r--gst-libs/gst/colorbalance/Makefile.am18
-rw-r--r--gst-libs/gst/mixer/Makefile.am15
-rw-r--r--gst-libs/gst/play/Makefile.am5
-rw-r--r--gst-libs/gst/tuner/Makefile.am16
6 files changed, 39 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 6979c344..efd580eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-03 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * common/glib-gen.mak:
+ add hack rule to touch .Plo files
+ * gst-libs/gst/colorbalance/Makefile.am:
+ * gst-libs/gst/mixer/Makefile.am:
+ * gst-libs/gst/play/Makefile.am:
+ * gst-libs/gst/tuner/Makefile.am:
+ remove glib_root variable
+
2004-02-03 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream):
diff --git a/common b/common
-Subproject 0f9fe900b0757fd2450454a1af24146b47aaaac
+Subproject 28760b093e73a78cdd0c1fba76baa5d87dc2c0f
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index 2571f44b..fbd050d0 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -1,7 +1,6 @@
# 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 = \
@@ -11,9 +10,13 @@ colorbalance_headers = \
colorbalance.h \
colorbalancechannel.h
+built_sources = \
+ colorbalance-marshal.c \
+ colorbalance-enumtypes.c
+
built_headers = \
- $(glib_root)-marshal.h \
- $(glib_root)-enumtypes.h
+ colorbalance-marshal.h \
+ colorbalance-enumtypes.h
libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) $(built_headers)
@@ -22,16 +25,15 @@ noinst_LTLIBRARIES = libgstcolorbalance.la
libgstcolorbalance_la_SOURCES = \
colorbalance.c \
colorbalancechannel.c \
- $(glib_root)-marshal.c \
- $(glib_root)-enumtypes.c
+ $(built_sources)
+
libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
BUILT_SOURCES = \
- $(glib_root)-marshal.c \
- $(glib_root)-enumtypes.c \
+ $(built_sources) \
$(built_headers)
-EXTRA_DIST = $(glib_root)-marshal.list
+EXTRA_DIST = colorbalance-marshal.list
CLEANFILES = $(BUILT_SOURCES)
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index 7c52dda6..79d40f9c 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -1,7 +1,6 @@
# variables used for enum/marshal generation
glib_enum_headers=$(mixer_headers)
glib_enum_define=GST_MIXER
-glib_root=mixer
glib_enum_prefix=gst_mixer
@@ -12,9 +11,13 @@ mixer_headers = \
mixer.h \
mixertrack.h
+built_sources = \
+ mixer-marshal.c \
+ mixer-enumtypes.c
+
built_headers = \
- $(glib_root)-marshal.h \
- $(glib_root)-enumtypes.h
+ mixer-marshal.h \
+ mixer-enumtypes.h
libgstmixerinclude_HEADERS = $(mixer_headers) $(built_headers)
@@ -23,14 +26,12 @@ noinst_LTLIBRARIES = libgstmixer.la
libgstmixer_la_SOURCES = \
mixer.c \
mixertrack.c \
- $(glib_root)-marshal.c \
- $(glib_root)-enumtypes.c
+ $(built_sources)
libgstmixer_la_CFLAGS = $(GST_CFLAGS)
BUILT_SOURCES = \
- $(glib_root)-marshal.c \
- $(glib_root)-enumtypes.c \
+ $(built_sources) \
$(built_headers)
EXTRA_DIST = mixer-marshal.list
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index 17460384..810ad9b8 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -1,7 +1,6 @@
# 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)
@@ -10,7 +9,7 @@ play_headers = \
play.h
built_headers = \
- $(glib_root)-enumtypes.h
+ play-enumtypes.h
library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
@@ -28,7 +27,7 @@ libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = \
-version-info @GST_PLUGINS_LIBVERSION@
BUILT_SOURCES = \
- $(glib_root)-enumtypes.c \
+ play-enumtypes.c \
$(built_headers)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index af1020fa..ebfca95e 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -1,7 +1,6 @@
# 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 = \
@@ -12,9 +11,13 @@ tuner_headers = \
tunernorm.h \
tunerchannel.h
+built_sources = \
+ tuner-marshal.c \
+ tuner-enumtypes.c
+
built_headers = \
- $(glib_root)-marshal.h \
- $(glib_root)-enumtypes.h
+ tuner-marshal.h \
+ tuner-enumtypes.h
libgsttunerinclude_HEADERS = $(tuner_headers) $(built_headers)
@@ -24,16 +27,15 @@ libgsttuner_la_SOURCES = \
tuner.c \
tunernorm.c \
tunerchannel.c \
- $(glib_root)-marshal.c
+ $(built_sources)
libgsttuner_la_CFLAGS = $(GST_CFLAGS)
BUILT_SOURCES = \
- $(glib_root)-marshal.c \
- $(glib_root)-enumtypes.c \
+ $(built_sources) \
$(built_headers)
-EXTRA_DIST = $(glib_root)-marshal.list
+EXTRA_DIST = tuner-marshal.list
CLEANFILES = $(BUILT_SOURCES)