gst/autoplug/Makefile.am: Fix some little buglets in last checkin.

Original commit message from CVS:
* gst/autoplug/Makefile.am:  Fix some little buglets in last checkin.
* gst/indexers/Makefile.am:
* gst/schedulers/Makefile.am:
* libs/gst/bytestream/Makefile.am:
* libs/gst/control/Makefile.am:
* libs/gst/getbits/Makefile.am:

diff --git a/ChangeLog b/ChangeLog
index c506703..0ea88f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-04-20  David Schleef  <ds@schleef.org>
 
+       * gst/autoplug/Makefile.am:  Fix some little buglets in last checkin.
+       * gst/indexers/Makefile.am:
+       * gst/schedulers/Makefile.am:
+       * libs/gst/bytestream/Makefile.am:
+       * libs/gst/control/Makefile.am:
+       * libs/gst/getbits/Makefile.am:
+
+2004-04-20  David Schleef  <ds@schleef.org>
+
        * common/as-libtool.mak: Fine-tune DLL building.
        * configure.ac: Link plugins against libgstreamer.  Define plugindir
        (like gst-plugins)

diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am
index 74a3b6c..f28cc1f 100644 (file)
--- a/gst/autoplug/Makefile.am
+++ b/gst/autoplug/Makefile.am
@@ -10,7 +10,7 @@ libgstspider_la_SOURCES = \
        gstsearchfuncs.c
 libgstspider_la_CFLAGS = $(GST_CFLAGS)
 libgstspider_la_LIBADD =
-libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 noinst_HEADERS = gstspider.h gstspideridentity.h gstsearchfuncs.h 
 

diff --git a/gst/indexers/Makefile.am b/gst/indexers/Makefile.am
index deadb82..46c7dcd 100644 (file)
--- a/gst/indexers/Makefile.am
+++ b/gst/indexers/Makefile.am
@@ -15,7 +15,7 @@ endif
 libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
 libgstindexers_la_CFLAGS = $(GST_CFLAGS)
 libgstindexers_la_LIBADD =
-libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 install-data-local: as-libtool-install-data-local
 

diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am
index ad092fe..30df5bb 100644 (file)
--- a/gst/schedulers/Makefile.am
+++ b/gst/schedulers/Makefile.am
@@ -26,12 +26,6 @@ AS_LIBTOOL_LIBS = \
        libgstoptscheduler \
        libgstoptgthreadscheduler
 
-if AS_LIBTOOL_WIN32
-as_libtool_LDFLAGS = -no-undefined
-else
-as_libtool_LDFLAGS =
-endif
-
 if GST_DISABLE_OMEGA_COTHREADS
 else
 libgstbasicomegascheduler_la_SOURCES = gstbasicscheduler.c 
@@ -95,6 +89,8 @@ as-libtool-uninstall-local:
        done
 else
 
+as_libtool_LDFLAGS =
+
 as-libtool-install-data-local:
 as-libtool-uninstall-local:
 

diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am
index 318018f..c6bee05 100644 (file)
--- a/libs/gst/bytestream/Makefile.am
+++ b/libs/gst/bytestream/Makefile.am
@@ -10,7 +10,7 @@ libgstbytestreaminclude_HEADERS = bytestream.h
 
 libgstbytestream_la_SOURCES = bytestream.c 
 libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
-libgstbytestream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstbytestream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 install-data-local: as-libtool-install-data-local
 

diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am
index 8956cfc..c3432d3 100644 (file)
--- a/libs/gst/control/Makefile.am
+++ b/libs/gst/control/Makefile.am
@@ -24,7 +24,7 @@ libgstcontrol_@GST_MAJORMINOR@_la_SOURCES = \
     dplinearinterp.c
 
 libgstcontrol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
+libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ $(as_libtool_LDFLAGS)
 # control uses log and exp, so we need -lm if xml is disabled
 libgstcontrol_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -lm
 

diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am
index 359839e..26b8f35 100644 (file)
--- a/libs/gst/getbits/Makefile.am
+++ b/libs/gst/getbits/Makefile.am
@@ -19,7 +19,7 @@ libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GST
 EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
 
 libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
-libgstgetbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgetbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 # check_PROGRAMS = gbtest
 

diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am
index deadb82..46c7dcd 100644 (file)
--- a/plugins/indexers/Makefile.am
+++ b/plugins/indexers/Makefile.am
@@ -15,7 +15,7 @@ endif
 libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
 libgstindexers_la_CFLAGS = $(GST_CFLAGS)
 libgstindexers_la_LIBADD =
-libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 install-data-local: as-libtool-install-data-local