summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-07-27 05:20:47 +0000
committerDavid Schleef <ds@schleef.org>2003-07-27 05:20:47 +0000
commita10432d76cb431d03e27b97d790d2ba7ae34f4b8 (patch)
treeaa2abdcf15c37b560dc6e927dd04240aa8f94873 /ext
parent907bee8c030be9c8a7c9a15238d9bc11bf93e057 (diff)
downloadgst-plugins-bad-a10432d76cb431d03e27b97d790d2ba7ae34f4b8.tar.gz
gst-plugins-bad-a10432d76cb431d03e27b97d790d2ba7ae34f4b8.tar.bz2
gst-plugins-bad-a10432d76cb431d03e27b97d790d2ba7ae34f4b8.zip
Change to build against library in gst-libs/ext/mplex
Original commit message from CVS: Change to build against library in gst-libs/ext/mplex
Diffstat (limited to 'ext')
-rw-r--r--ext/mplex/Makefile.am30
1 files changed, 2 insertions, 28 deletions
diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am
index 96f88d44..d3a25ee0 100644
--- a/ext/mplex/Makefile.am
+++ b/ext/mplex/Makefile.am
@@ -1,36 +1,10 @@
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
-CC = g++
-
-EXTRA_DIST = \
- README INSTRUCT TODO \
- .cvsignore
-
-MAINTAINERCLEANFILES = Makefile.in
-
-gstmplex_SOURCES = \
- bits.cc bits.hh \
- buffer.cc buffer.hh \
- videostrm.hh audiostrm.hh padstrm.hh \
- videostrm_in.cc padstrm.cc \
- lpcmstrm_in.cc mpastrm_in.cc ac3strm_in.cc \
- videostrm_out.cc audiostrm_out.cc \
- multplex.cc outputstream.hh \
- systems.cc systems.hh \
- vector.cc vector.hh mplexconsts.hh \
- inputstrm.cc inputstrm.hh aunit.hh \
- stillsstream.cc stillsstream.hh \
- mjpeg_logging.cc mjpeg_logging.h \
- yuv4mpeg.cc yuv4mpeg_ratio.cc yuv4mpeg.h \
- mpegconsts.cc mpegconsts.h
-
plugin_LTLIBRARIES = libgstmplex.la
-libgstmplex_la_SOURCES = gstmplex.cc \
- $(gstmplex_SOURCES)
-
+libgstmplex_la_SOURCES = gstmplex.cc
libgstmplex_la_CXXFLAGS = $(GST_CFLAGS)
-libgstmplex_la_LIBADD = -lstdc++ $(LIBM_LIBS)
+libgstmplex_la_LIBADD = -lstdc++ $(LIBM_LIBS) $(top_builddir)/gst-libs/ext/mplex/libmplex.la
libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstmplex.h