Don't know how these escaped my eye before. Fix link flags.

Original commit message from CVS:
Don't know how these escaped my eye before.  Fix link flags.

diff --git a/ChangeLog b/ChangeLog
index 14752eb..24aff91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * ext/amrnb/Makefile.am:
+       * gst/realmedia/Makefile.am:
+         Don't know how these escaped my eye before.  Fix link flags.
+
 2005-11-29  Michal Benes  <michal dot benes at xeris dot cz>
 
        Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>

diff --git a/common b/common
index f9f5f06..54bb21c 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f9f5f063728688cf455a1512d492b632c43963d7
+Subproject commit 54bb21c57bb86941d80c15590e0a121405173156

diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 961cbe9..59895d6 100644 (file)
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -7,8 +7,8 @@ libgstamrnb_la_SOURCES = \
        amrnbparse.c
 
 libgstamrnb_la_CFLAGS = $(GST_CFLAGS) $(AMRNB_CFLAGS)
-libgstamrnb_la_LIBADD = $(AMRNB_LIBS)
-libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)  $(GST_BASE_LIBS)
+libgstamrnb_la_LIBS = $(GST_BASE_LIBS) $(AMRNB_LIBS)
+libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = \
        amrnbdec.h \

diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index 07c5aa8..9b6b345 100644 (file)
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -1,10 +1,9 @@
-
 plugin_LTLIBRARIES = libgstrmdemux.la
 
 libgstrmdemux_la_SOURCES = rmdemux.c
 
 libgstrmdemux_la_CFLAGS = $(GST_CFLAGS)
-libgstrmdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
+libgstrmdemux_la_LIBS = $(GST_BASE_LIBS)
+libgstrmdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = rmdemux.h
-