fix up Makefile.am and remove GST_ENABLE_NEW

Original commit message from CVS:
fix up Makefile.am and remove GST_ENABLE_NEW

diff --git a/ChangeLog b/ChangeLog
index d4c77f3..e1da242 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-11-27  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * check/Makefile.am:
+       * libs/gst/controller/Makefile.am:
+       * libs/gst/dataprotocol/Makefile.am:
+         fix up Makefile.am and remove GST_ENABLE_NEW
+
+2005-11-27  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * configure.ac:
        * gst/Makefile.am:
        * gst/base/Makefile.am:

diff --git a/check/Makefile.am b/check/Makefile.am
index 726cfbf..ada1918 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -73,9 +73,7 @@ LDADD = $(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
 gst_libs_gdp_SOURCES = \
        gst-libs/gdp.c \
        $(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
-# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
-# FIXME: time to do this
-gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
+gst_libs_gdp_CFLAGS = $(AM_CFLAGS)
 
 gst_libs_controller_LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \

diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am
index 76ce631..015301d 100644 (file)
--- a/libs/gst/controller/Makefile.am
+++ b/libs/gst/controller/Makefile.am
@@ -12,4 +12,4 @@ libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \
 
 libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
 libgstcontroller_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
-libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS)
+libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am
index 9402b9d..d879fda 100644 (file)
--- a/libs/gst/dataprotocol/Makefile.am
+++ b/libs/gst/dataprotocol/Makefile.am
@@ -8,8 +8,7 @@ noinst_HEADERS = dp-private.h
 libgstdataprotocol_@GST_MAJORMINOR@_la_SOURCES = \
     dataprotocol.c
 
-# FIXME: do this now
-# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
-libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -DGST_ENABLE_NEW
+libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
 libgstdataprotocol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
-libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS)
+libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 726cfbf..ada1918 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -73,9 +73,7 @@ LDADD = $(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
 gst_libs_gdp_SOURCES = \
        gst-libs/gdp.c \
        $(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
-# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
-# FIXME: time to do this
-gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
+gst_libs_gdp_CFLAGS = $(AM_CFLAGS)
 
 gst_libs_controller_LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \