Fix undefined symbols (link to appropriate libraries)

CVS patchset: 3589
CVS date: 2002/12/19 21:40:02

6 files changed, 14 insertions, 3 deletions

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 3af71def1..733c60cfe 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -63,7 +63,7 @@ xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS)
 xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c 
-xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
+xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB)
 xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index 0d6291b08..72a3d3205 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -21,6 +21,7 @@ xineplug_decode_mad_la_SOURCES = \
 	version.c \
 	xine_decoder.c
 
+xineplug_decode_mad_la_LIBADD = $(XINE_LIB)
 xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = \
diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am
index a9268222d..bd79fe1e1 100644
--- a/src/libreal/Makefile.am
+++ b/src/libreal/Makefile.am
@@ -9,9 +9,11 @@ libdir = $(XINE_PLUGINDIR)
 lib_LTLIBRARIES = xineplug_decode_real.la xineplug_decode_real_audio.la
 
 xineplug_decode_real_la_SOURCES = xine_decoder.c
+xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
 xineplug_decode_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_real_audio_la_SOURCES = audio_decoder.c
+xineplug_decode_real_audio_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
 xineplug_decode_real_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 debug:
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index 7bc7eaa4e..7c620a405 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -33,6 +33,7 @@ xineplug_decode_msvc_la_LIBADD = $(XINE_LIB)
 xineplug_decode_msvc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_roqvideo_la_SOURCES = roqvideo.c
+xineplug_decode_roqvideo_la_LIBADD = $(XINE_LIB)
 xineplug_decode_roqvideo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_svq1_la_SOURCES = svq1.c svq1_codebooks.h
@@ -44,12 +45,15 @@ xineplug_decode_fli_la_LIBADD = $(XINE_LIB)
 xineplug_decode_fli_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_rgb_la_SOURCES = rgb.c
+xineplug_decode_rgb_la_LIBADD = $(XINE_LIB)
 xineplug_decode_rgb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_yuv_la_SOURCES = yuv.c
+xineplug_decode_yuv_la_LIBADD = $(XINE_LIB)
 xineplug_decode_yuv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_msrle_la_SOURCES = msrle.c
+xineplug_decode_msrle_la_LIBADD = $(XINE_LIB)
 xineplug_decode_msrle_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_idcinvideo_la_SOURCES = idcinvideo.c
@@ -57,15 +61,19 @@ xineplug_decode_idcinvideo_la_LIBADD = $(XINE_LIB)
 xineplug_decode_idcinvideo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_qtsmc_la_SOURCES = qtsmc.c
+xineplug_decode_qtsmc_la_LIBADD = $(XINE_LIB)
 xineplug_decode_qtsmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_qtrpza_la_SOURCES = qtrpza.c
+xineplug_decode_qtrpza_la_LIBADD = $(XINE_LIB)
 xineplug_decode_qtrpza_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_wc3video_la_SOURCES = wc3video.c
+xineplug_decode_wc3video_la_LIBADD = $(XINE_LIB)
 xineplug_decode_wc3video_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_decode_qtrle_la_SOURCES = qtrle.c
+xineplug_decode_qtrle_la_LIBADD = $(XINE_LIB)
 xineplug_decode_qtrle_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = svq1_codebooks.h
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index b5babca59..cfff89314 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -102,7 +102,7 @@ xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 #xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
-xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
+xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB)
 xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index b3378b120..8293edfaf 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -19,7 +19,7 @@ libxine_la_SOURCES = $(nvtv) xine.c metronom.c configfile.c buffer.c \
 libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB)
 
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS)\
-	             -lm $(XINEUTILS_LIB)
+	             -lm $(XINEUTILS_LIB) $(X_LIBS) $(EXTRA_X_LIBS)
 
 libxine_la_LDFLAGS =  \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)