gst-libs/gst/Makefile.am: Enable xoverlay unconditionally, since it doesn't depend...

Original commit message from CVS:
* gst-libs/gst/Makefile.am:  Enable xoverlay unconditionally,
since it doesn't depend on X, and it's part of our ABI.

diff --git a/ChangeLog b/ChangeLog
index b14a843..8257882 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-19  David Schleef  <ds@schleef.org>
+
+       * gst-libs/gst/Makefile.am:  Enable xoverlay unconditionally,
+       since it doesn't depend on X, and it's part of our ABI.
+
 2004-03-19  Iain <iain@prettypeople.org>
 
        * gst/interleave/deinterleave.c (deinterleave_sink_link): Use the 

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index e4859b2..e62f4b1 100644 (file)
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -5,11 +5,9 @@ GCONF_DIR =
 endif
 
 if USE_X
-X_DIR = xwindowlistener xoverlay
-X_INTERFACE_LIBS = xoverlay/libgstxoverlay.la
+X_DIR = xwindowlistener
 else
 X_DIR =
-X_INTERFACE_LIBS =
 endif
 
 SUBDIRS = \
@@ -28,6 +26,7 @@ SUBDIRS = \
        tag \
        tuner \
        video \
+       xoverlay \
        $(X_DIR)
 
 DIST_SUBDIRS = \
@@ -60,7 +59,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \
        navigation/libgstnavigation.la \
        propertyprobe/libgstpropertyprobe.la \
        tuner/libgsttuner.la \
-        $(X_INTERFACE_LIBS) \
+       xoverlay/libgstxoverlay.la \
        $(GST_LIBS)
 
 libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@