diff options
| author | David Schleef <ds@schleef.org> | 2004-03-19 23:44:33 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-03-19 23:44:33 +0000 |
| commit | 09871dd08142431adc170dce470f24895865957d (patch) | |
| tree | 2de06db98ca626faf535468c6da940592c6fb5b5 | |
| parent | c2c6db137c414c02eabf0152bf5496e5f6898465 (diff) | |
| download | gst-plugins-bad-09871dd08142431adc170dce470f24895865957d.tar.gz gst-plugins-bad-09871dd08142431adc170dce470f24895865957d.tar.bz2 gst-plugins-bad-09871dd08142431adc170dce470f24895865957d.zip | |
gst-libs/gst/Makefile.am: Enable xoverlay unconditionally, since it doesn't depend on X, and it's part of our ABI.
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gst-libs/gst/Makefile.am | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -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 e4859b29..e62f4b19 100644 --- 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@ |