summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEwald Snel <esnel@users.sourceforge.net>2002-10-24 09:42:21 +0000
committerEwald Snel <esnel@users.sourceforge.net>2002-10-24 09:42:21 +0000
commit754fcb2fce9b2b9c9c0f04099dd6580428e8ff90 (patch)
tree21a3c889b4eb12e83120cae394ca02fde3095208
parent8d96c1b5a9344b593e8fbc1f4f67cc053754eaf9 (diff)
downloadxine-lib-754fcb2fce9b2b9c9c0f04099dd6580428e8ff90.tar.gz
xine-lib-754fcb2fce9b2b9c9c0f04099dd6580428e8ff90.tar.bz2
Fix unresolved symbols by linking with the xine library
CVS patchset: 2980 CVS date: 2002/10/24 09:42:21
-rw-r--r--src/liba52/Makefile.am1
-rw-r--r--src/libffmpeg/Makefile.am1
-rw-r--r--src/libxineadec/Makefile.am3
-rw-r--r--src/libxinevdec/Makefile.am4
4 files changed, 9 insertions, 0 deletions
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index 36225ab3e..a32acbd2c 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -15,6 +15,7 @@ xineplug_decode_a52_la_SOURCES = \
parse.c \
xine_decoder.c
+xineplug_decode_a52_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_a52_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = \
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 8b798517c..4255d37b8 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -19,6 +19,7 @@ lib_LTLIBRARIES = xineplug_decode_ff.la
xineplug_decode_ff_la_SOURCES = xine_decoder.c
xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
xineplug_decode_ff_la_LIBADD = \
+ $(top_builddir)/src/xine-engine/libxine.la \
$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
debug:
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 10ebe0460..ded631840 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -17,14 +17,17 @@ xineplug_decode_roqaudio_la_SOURCES = roqaudio.c
xineplug_decode_roqaudio_la_LDFLAGS = -avoid-version -module
xineplug_decode_adpcm_la_SOURCES = adpcm.c
+xineplug_decode_adpcm_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_adpcm_la_LDFLAGS = -avoid-version -module
xineplug_decode_logpcm_la_SOURCES = logpcm.c
+xineplug_decode_logpcm_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_logpcm_la_LDFLAGS = -avoid-version -module
xineplug_decode_gsm610_la_SOURCES = gsm610.c
xineplug_decode_gsm610_la_LDFLAGS = -avoid-version -module
xineplug_decode_gsm610_la_LIBADD = \
+ $(top_builddir)/src/xine-engine/libxine.la \
$(top_builddir)/src/libxineadec/gsm610/libgsm610.la
# noinst_HEADERS =
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index f7fd2d4d9..6f3ee0f8e 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -21,9 +21,11 @@ lib_LTLIBRARIES = \
xineplug_decode_qtrle.la
xineplug_decode_cinepak_la_SOURCES = cinepak.c
+xineplug_decode_cinepak_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_cinepak_la_LDFLAGS = -avoid-version -module
xineplug_decode_cyuv_la_SOURCES = cyuv.c
+xineplug_decode_cyuv_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_cyuv_la_LDFLAGS = -avoid-version -module
xineplug_decode_msvc_la_SOURCES = msvc.c
@@ -36,6 +38,7 @@ xineplug_decode_svq1_la_SOURCES = svq1.c svq1_codebooks.h
xineplug_decode_svq1_la_LDFLAGS = -avoid-version -module
xineplug_decode_fli_la_SOURCES = fli.c
+xineplug_decode_fli_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_fli_la_LDFLAGS = -avoid-version -module
xineplug_decode_rgb_la_SOURCES = rgb.c
@@ -48,6 +51,7 @@ xineplug_decode_msrle_la_SOURCES = msrle.c
xineplug_decode_msrle_la_LDFLAGS = -avoid-version -module
xineplug_decode_idcinvideo_la_SOURCES = idcinvideo.c
+xineplug_decode_idcinvideo_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_idcinvideo_la_LDFLAGS = -avoid-version -module
xineplug_decode_qtsmc_la_SOURCES = qtsmc.c