summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-12-03 12:49:29 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-12-03 12:49:29 +0000
commitaf1f5b95a241096c7535a679351a2b3a6d4378c1 (patch)
tree91713c6749068da73e3f0d8fd99a5f08d823ba35 /gst-libs/gst
parent14bbf6cfeb4b32524560767b173dbb9358b5d539 (diff)
downloadgst-plugins-bad-af1f5b95a241096c7535a679351a2b3a6d4378c1.tar.gz
gst-plugins-bad-af1f5b95a241096c7535a679351a2b3a6d4378c1.tar.bz2
gst-plugins-bad-af1f5b95a241096c7535a679351a2b3a6d4378c1.zip
fix X dependencies
Original commit message from CVS: fix X dependencies
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/Makefile.am12
1 files changed, 7 insertions, 5 deletions
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index c39924ca..9cb04fea 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -1,13 +1,15 @@
if USE_GCONF
-GCONF_DIR=gconf
+GCONF_DIR = gconf
else
-GCONF_DIR=
+GCONF_DIR =
endif
if USE_X
-X_DIR=xwindowlistener xoverlay
+X_DIR = xwindowlistener xoverlay
+X_INTERFACE_LIBS = xoverlay/libgstxoverlay.la
else
-X_DIR=
+X_DIR =
+X_INTERFACE_LIBS =
endif
SUBDIRS = audio colorbalance floatcast \
@@ -33,7 +35,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \
navigation/libgstnavigation.la \
propertyprobe/libgstpropertyprobe.la \
tuner/libgsttuner.la \
- xoverlay/libgstxoverlay.la \
+ $(X_INTERFACE_LIBS) \
$(GST_LIBS)
libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@