summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-10-22 00:52:09 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-10-22 00:52:09 +0000
commit1daeddffa3521a15493dbbd57ea8847f09d931b1 (patch)
tree94435a387eb7e44bd3255faffd36ad6bfaa68a8b /src/demuxers
parent66c7a3a86eebc9850ff3aa908ca0acc171450f77 (diff)
downloadxine-lib-1daeddffa3521a15493dbbd57ea8847f09d931b1.tar.gz
xine-lib-1daeddffa3521a15493dbbd57ea8847f09d931b1.tar.bz2
introducing libxineutils and a this pointer for video_out_x11 callbacks
CVS patchset: 852 CVS date: 2001/10/22 00:52:09
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/Makefile.am13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 57cfac345..77b017c9a 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -21,36 +21,43 @@ lib_LTLIBRARIES = $(ogg_module) xineplug_dmx_avi.la \
xineplug_dmx_qt.la xineplug_dmx_asf.la
xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
-xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@
+xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@ $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module
xineplug_dmx_avi_la_SOURCES = demux_avi.c
+xineplug_dmx_avi_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_avi_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c
+xineplug_dmx_mpeg_block_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la $(top_builddir)/src/xine-engine/libxine.la
xineplug_dmx_mpeg_block_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
+xineplug_dmx_mpeg_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_mpeg_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_audio_la_SOURCES = demux_mpgaudio.c
-xineplug_dmx_mpeg_audio_la_LIBADD = -lm
+xineplug_dmx_mpeg_audio_la_LIBADD = -lm $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_mpeg_audio_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c
+xineplug_dmx_mpeg_elem_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_pes_la_SOURCES = demux_pes.c
+xineplug_dmx_mpeg_pes_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_mpeg_pes_la_LDFLAGS = -avoid-version -module
xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c
+xineplug_dmx_mpeg_ts_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_mpeg_ts_la_LDFLAGS = -avoid-version -module
xineplug_dmx_qt_la_SOURCES = demux_qt.c
xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module
-xineplug_dmx_qt_la_LIBADD = -lz
+xineplug_dmx_qt_la_LIBADD = -lz $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_asf_la_SOURCES = demux_asf.c
+xineplug_dmx_asf_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module
include_HEADERS = demux.h