summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-12-01 15:49:59 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-12-01 15:49:59 +0000
commit11677c9968f6cd097aff9ffd35a70911857f0e1e (patch)
tree5a2392179f06885c196a5f7cdcfaa6684c894199
parentcc02c82c7607aaecb45cfd54c32ae93edc86dca0 (diff)
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.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--ext/amrnb/Makefile.am4
-rw-r--r--gst/realmedia/Makefile.am5
4 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 14752eb0..24aff91d 100644
--- 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
-Subproject f9f5f063728688cf455a1512d492b632c43963d
+Subproject 54bb21c57bb86941d80c15590e0a12140517315
diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 961cbe91..59895d60 100644
--- 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 07c5aa89..9b6b345b 100644
--- 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
-