remove glib_root add hack rule for .Plo files

Original commit message from CVS:
remove glib_root
add hack rule for .Plo files

diff --git a/ChangeLog b/ChangeLog
index 6979c3445402755d601709defcf0522dc5c6f330..efd580eb75a99514c96e6291be41b46fa04697d9 100644 (file)
--- 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
index 0f9fe900b0757fd2450454a1af24146b47aaaac2..28760b093e73a78cdd0c1fba76baa5d87dc2c0f2 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0f9fe900b0757fd2450454a1af24146b47aaaac2
+Subproject commit 28760b093e73a78cdd0c1fba76baa5d87dc2c0f2

diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index 2571f44b42bcde3cc8c57257dd6f947008e318e5..fbd050d079a63d4317a8131012faed92a34edc62 100644 (file)
--- 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 7c52dda6cdc107edd3643a439f0e1e4a5e0fcddc..79d40f9c48b87ef3202fbb4fd974a0e099aefae5 100644 (file)
--- 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 17460384d6b3cf8f0f479d85288bba2d9e427fc8..810ad9b8b038fe232bbd971cc040c60f898c032d 100644 (file)
--- 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 af1020faae1e37068bc58511339459b76f76aa43..ebfca95e978f5c5806faed78142b87ebbcb162a6 100644 (file)
--- 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)