summaryrefslogtreecommitdiff
path: root/gstplay
diff options
context:
space:
mode:
authorRichard Boulton <richard@tartarus.org>2000-08-19 00:29:57 +0000
committerRichard Boulton <richard@tartarus.org>2000-08-19 00:29:57 +0000
commitcf0a34528d618eeda1ad7066d0370f6d0ae70fa7 (patch)
tree10c3346f0ebedccc49453e9a4aef3a0f08ecb5f6 /gstplay
parent9ae673e291cf0107034065dff25dd35e7db09f02 (diff)
libXv is now linked against by test/* and gstplay if it is present.
Original commit message from CVS: libXv is now linked against by test/* and gstplay if it is present. -lXv isn't leaked all over the place due to AC_CHECK_LIB test. This is still messy though - we shouldn't have to link explicitly with extra things just because we use certain plugins. Build Makefile in tests, but don't recurse into tests when doing the build (tests no longer in SUBDIRS).
Diffstat (limited to 'gstplay')
-rw-r--r--gstplay/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/gstplay/Makefile.am b/gstplay/Makefile.am
index d7a3c1c7d..63981b300 100644
--- a/gstplay/Makefile.am
+++ b/gstplay/Makefile.am
@@ -22,7 +22,13 @@ CFLAGS += -O2 -Wall -DDATADIR=\""$(gladedir)/"\"
gstplay_CFLAGS = $(shell gnome-config --cflags gnomeui) $(shell libglade-config --cflags gnome)
gstplay_LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome)
+if HAVE_LIBXV
+xvlibs=-lXv
+else
+xvlibs=
+endif
+
gstplay_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \
- $(top_builddir)/plugins/videosink/gdkxvimage.lo -lXv -lXxf86vm
+ $(top_builddir)/plugins/videosink/gdkxvimage.lo ${xvlibs} -lXxf86vm