summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-07-09 10:45:37 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-07-09 10:45:37 +0000
commitc02f0b607ddc86354ad4b22d4dc719e074a43c87 (patch)
tree01e8bb4779bdbb93e75cd8381316e02dcc2b4ef4 /gst-libs/gst
parentd0f17f51db700fcb04186ca4d388d49f0d33dfce (diff)
downloadgst-plugins-bad-c02f0b607ddc86354ad4b22d4dc719e074a43c87.tar.gz
gst-plugins-bad-c02f0b607ddc86354ad4b22d4dc719e074a43c87.tar.bz2
gst-plugins-bad-c02f0b607ddc86354ad4b22d4dc719e074a43c87.zip
merge from release branch
Original commit message from CVS: merge from release branch
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/gconf/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index d1d10e86..0514c53c 100644
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -10,7 +10,7 @@ libgstgconfinclude_HEADERS = gconf.h
noinst_PROGRAMS = test-gconf
test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
-test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) -lgstgconf
+test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf.la
libgstgconf_la_LIBADD = $(GCONF_LIBS)
libgstgconf_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)