Fix for unresolved symbols in plugins

CVS patchset: 1745
CVS date: 2002/04/20 14:02:45

8 files changed, 32 insertions, 8 deletions

diff --git a/misc/guenter.spec.in b/misc/guenter.spec.in
index 886aaf318..cd38f98a4 100644
--- a/misc/guenter.spec.in
+++ b/misc/guenter.spec.in
@@ -39,7 +39,7 @@ make
 %install
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 #mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps
-make install-strip prefix=$RPM_BUILD_ROOT%{prefix}
+make install-strip prefix=$RPM_BUILD_ROOT%{prefix} LIBRARY_PATH=$RPM_BUILD_ROOT%{prefix}/lib
 #cp doc/*.xpm $RPM_BUILD_ROOT/usr/include/X11/pixmaps
 
 %clean
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 0da8c9072..f70bc69f9 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -158,7 +158,7 @@ make
 %install
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 #mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps
-make install-strip DESTDIR=$RPM_BUILD_ROOT
+make install-strip DESTDIR=$RPM_BUILD_ROOT LIBRARY_PATH=$RPM_BUILD_ROOT%{prefix}/lib
 #cp doc/*.xpm $RPM_BUILD_ROOT/usr/include/X11/pixmaps
 
 %clean
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 6654f244b..b0d482fa8 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -29,39 +29,48 @@ lib_LTLIBRARIES = $(ogg_module) $(qt_modules) $(asf_module) xineplug_dmx_avi.la
 	xineplug_dmx_cda.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-engine/libxine.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-engine/libxine.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-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-engine/libxine.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-engine/libxine.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-engine/libxine.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-engine/libxine.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-engine/libxine.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-engine/libxine.la
 
 xineplug_dmx_asf_la_SOURCES = demux_asf.c
+xineplug_dmx_asf_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module
 
 xineplug_dmx_cda_la_SOURCES = demux_cda.c
+xineplug_dmx_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_dmx_cda_la_LDFLAGS = -avoid-version -module
 
 include_HEADERS = demux.h
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 4d0ee3699..03c5c2e71 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -23,30 +23,39 @@ lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) $(in_cda) \
 	xineplug_inp_rtp.la xineplug_inp_http.la xineplug_inp_mms.la
 
 xineplug_inp_file_la_SOURCES = input_file.c
+xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_file_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_dvd_la_SOURCES = input_dvd.c dvd_udf.c read_cache.c
+xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
+xineplug_inp_net_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_net_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c asxparser.c
+xineplug_inp_mms_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_mms_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_vcd_la_SOURCES = input_vcd.c
+xineplug_inp_vcd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
+xineplug_inp_stdin_fifo_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_rtp_la_SOURCES = input_rtp.c
+xineplug_inp_rtp_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c
+xineplug_inp_http_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_http_la_LDFLAGS = -avoid-version -module
 
 xineplug_inp_cda_la_SOURCES = input_cda.c
+xineplug_inp_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_inp_cda_la_LDFLAGS = -avoid-version -module
 
 include_HEADERS = input_plugin.h
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index 37c5a9b53..28a727093 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -16,6 +16,7 @@ xineplug_decode_mpeg2_la_SOURCES = slice.c header.c stats.c idct.c \
 	motion_comp.c decode.c idct_mmx.c motion_comp_mmx.c \
 	idct_mlib.c motion_comp_mlib.c idct_altivec.c \
 	motion_comp_altivec.c cpu_state.c xine_decoder.c
+xineplug_decode_mpeg2_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h 
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index c470ff4a4..d90ae5aa2 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -5,6 +5,7 @@ libdir = $(XINE_PLUGINDIR)
 lib_LTLIBRARIES = xineplug_decode_spucc.la
 
 xineplug_decode_spucc_la_SOURCES =  xine_decoder.c cc_decoder.c
+xineplug_decode_spucc_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = cc_decoder.h
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 69e58a28e..c4b3e308f 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -5,6 +5,7 @@ libdir = $(XINE_PLUGINDIR)
 lib_LTLIBRARIES = xineplug_decode_spu.la
 
 xineplug_decode_spu_la_SOURCES =  spu.c xine_decoder.c nav_read.c nav_print.c
+xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_decode_spu_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = spu.h nav_read.h bswap.h nav_print.h nav_types.h
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index d05b74c3c..2700996d0 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -46,12 +46,14 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module) $(aa_module) \
                   $(syncfb_module) $(fb_module) $(opengl_module)
 
 xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD =  $(XV_LIB) $(X_LIBS) -lXext
+xineplug_vo_out_xv_la_LIBADD =  $(XV_LIB) $(X_LIBS) -lXext \
+	$(top_builddir)/src/xine-utils/libxineutils.la
 xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	alphablend.c video_out_xshm.c
-xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext
+xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext \
+	$(top_builddir)/src/xine-utils/libxineutils.la
 xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
@@ -60,7 +62,7 @@ xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_
 xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
-xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS)
+xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
 xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
@@ -69,6 +71,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	alphablend.c video_out_fb.c
+xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
 xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c