summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/Makefile.am57
-rw-r--r--src/dxr3/Makefile.am8
-rw-r--r--src/input/Makefile.am22
-rw-r--r--src/liba52/Makefile.am7
-rw-r--r--src/libfaad/Makefile.am6
-rw-r--r--src/libffmpeg/Makefile.am8
-rw-r--r--src/libmpeg2/Makefile.am6
-rw-r--r--src/libspucc/Makefile.am6
-rw-r--r--src/libspudec/Makefile.am6
-rw-r--r--src/libw32dll/Makefile.am7
-rw-r--r--src/libxineadec/Makefile.am10
-rw-r--r--src/libxinevdec/Makefile.am13
-rw-r--r--src/video_out/Makefile.am14
-rw-r--r--src/xine-engine/Makefile.am9
-rw-r--r--src/xine-utils/utils.c4
15 files changed, 117 insertions, 66 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 051af1d6b..feec4304d 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -35,6 +35,8 @@ endif
# xineplug_dmx_yuv4mpeg2.la xineplug_dmx_real.la
# xineplug_dmx_mpeg_pes.la xineplug_dmx_mpeg_ts.la
+XINELIB = $(top_builddir)/src/xine-engine/libxine.la
+
lib_LTLIBRARIES = $(ogg_module) $(asf_module) xineplug_dmx_avi.la\
xineplug_dmx_mpeg_block.la \
xineplug_dmx_mpeg.la \
@@ -61,111 +63,114 @@ lib_LTLIBRARIES = $(ogg_module) $(asf_module) xineplug_dmx_avi.la\
xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
xineplug_dmx_ogg_la_LIBADD = $(OGG_LIBS) $(VORBIS_LIBS)\
- $(top_builddir)/src/xine-engine/libxine.la
+ $(XINELIB)
xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_avi_la_SOURCES = demux_avi.c
-xineplug_dmx_avi_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_avi_la_LIBADD = $(XINELIB)
xineplug_dmx_avi_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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_LIBADD = $(XINELIB)
xineplug_dmx_mpeg_block_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
-xineplug_dmx_mpeg_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_mpeg_la_LIBADD = $(XINELIB)
xineplug_dmx_mpeg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_mpeg_audio_la_SOURCES = demux_mpgaudio.c
-xineplug_dmx_mpeg_audio_la_LIBADD = -lm $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_mpeg_audio_la_LIBADD = -lm $(XINELIB)
xineplug_dmx_mpeg_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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_LIBADD = $(XINELIB)
xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#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_LIBADD = $(XINELIB)
#xineplug_dmx_mpeg_pes_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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_LIBADD = $(XINELIB)
xineplug_dmx_mpeg_ts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_qt_la_SOURCES = demux_qt.c qtpalette.h
-xineplug_dmx_qt_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_qt_la_LIBADD = $(XINELIB)
xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_asf_la_SOURCES = demux_asf.c
-xineplug_dmx_asf_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_asf_la_LIBADD = $(XINELIB)
xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_cda_la_SOURCES = demux_cda.c
-xineplug_dmx_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_cda_la_LIBADD = $(XINELIB)
xineplug_dmx_cda_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_film_la_SOURCES = demux_film.c
-xineplug_dmx_film_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_film_la_LIBADD = $(XINELIB)
xineplug_dmx_film_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_roq_la_SOURCES = demux_roq.c
-xineplug_dmx_roq_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_roq_la_LIBADD = $(XINELIB)
xineplug_dmx_roq_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_fli_la_SOURCES = demux_fli.c
-xineplug_dmx_fli_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_fli_la_LIBADD = $(XINELIB)
xineplug_dmx_fli_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_smjpeg_la_SOURCES = demux_smjpeg.c
-xineplug_dmx_smjpeg_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_smjpeg_la_LIBADD = $(XINELIB)
xineplug_dmx_smjpeg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_wav_la_SOURCES = demux_wav.c
-xineplug_dmx_wav_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_wav_la_LIBADD = $(XINELIB)
xineplug_dmx_wav_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_idcin_la_SOURCES = demux_idcin.c
-xineplug_dmx_idcin_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_idcin_la_LIBADD = $(XINELIB)
xineplug_dmx_idcin_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_wc3movie_la_SOURCES = demux_wc3movie.c
-xineplug_dmx_wc3movie_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_wc3movie_la_LIBADD = $(XINELIB)
xineplug_dmx_wc3movie_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_vqa_la_SOURCES = demux_vqa.c
-xineplug_dmx_vqa_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_vqa_la_LIBADD = $(XINELIB)
xineplug_dmx_vqa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_voc_la_SOURCES = demux_voc.c
-xineplug_dmx_voc_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_voc_la_LIBADD = $(XINELIB)
xineplug_dmx_voc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_aiff_la_SOURCES = demux_aiff.c
-xineplug_dmx_aiff_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_aiff_la_LIBADD = $(XINELIB)
xineplug_dmx_aiff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_snd_la_SOURCES = demux_snd.c
-xineplug_dmx_snd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_snd_la_LIBADD = $(XINELIB)
xineplug_dmx_snd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_yuv4mpeg2_la_SOURCES = demux_yuv4mpeg2.c
-xineplug_dmx_yuv4mpeg2_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_yuv4mpeg2_la_LIBADD = $(XINELIB)
xineplug_dmx_yuv4mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_real_la_SOURCES = demux_real.c
-xineplug_dmx_real_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_real_la_LIBADD = $(XINELIB)
xineplug_dmx_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_realaudio_la_SOURCES = demux_realaudio.c
-xineplug_dmx_realaudio_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_realaudio_la_LIBADD = $(XINELIB)
xineplug_dmx_realaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_eawve_la_SOURCES = demux_eawve.c
-xineplug_dmx_eawve_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_eawve_la_LIBADD = $(XINELIB)
xineplug_dmx_eawve_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
include_HEADERS = demux.h qtpalette.h
+$(XINELIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index d00a53ef2..e3a735f32 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,6 +1,7 @@
AM_CFLAGS = $(X_CFLAGS)
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
@@ -22,11 +23,11 @@ endif
lib_LTLIBRARIES = $(dxr3_modules)
xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c dxr3_scr.c
-xineplug_decode_dxr3_video_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
xineplug_decode_dxr3_video_la_LDFLAGS = -avoid-version -module
xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
-xineplug_decode_dxr3_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_dxr3_la_SOURCES = \
@@ -39,6 +40,9 @@ xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) \
$(top_builddir)/src/xine-utils/libxineutils.la
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
noinst_HEADERS = \
alphablend.h \
bswap.h \
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 41b8985db..a8974e46a 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = libdvdread libdvdnav
endif
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
@@ -61,39 +62,39 @@ lib_LTLIBRARIES = \
xineplug_inp_file_la_SOURCES = input_file.c
-xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_inp_file_la_LIBADD = $(XINE_LIB)
xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_dvd_la_SOURCES = input_dvd.c
-xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la $(link_dvdnav)
+xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#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_LIBADD = $(XINE_LIB)
#xineplug_inp_net_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c
-xineplug_inp_mms_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_inp_mms_la_LIBADD = $(XINE_LIB)
xineplug_inp_mms_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_vcd_la_SOURCES = input_vcd.c
-xineplug_inp_vcd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB)
xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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_LIBADD = $(XINE_LIB)
xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_inp_rtp_la_SOURCES = input_rtp.c
-#xineplug_inp_rtp_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+#xineplug_inp_rtp_la_LIBADD = $(XINE_LIB)
#xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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_LIBADD = $(XINE_LIB)
xineplug_inp_http_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_inp_cda_la_SOURCES = input_cda.c
-#xineplug_inp_cda_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+#xineplug_inp_cda_la_LIBADD = $(XINE_LIB)
#xineplug_inp_cda_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
include_HEADERS = input_plugin.h
@@ -101,6 +102,9 @@ noinst_HEADERS = net_buf_ctrl.h mms.h
EXTRA_DIST = input_dvd.c input_vcd.c
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index fa7e56cdb..15b0c41a6 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = $(LIBA52_CFLAGS)
DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS)
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_a52.la
@@ -15,7 +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_LIBADD = $(XINE_LIB)
xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = \
@@ -24,6 +24,9 @@ noinst_HEADERS = \
bitstream.h \
tables.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
index ac48ee879..fb3f7c7d7 100644
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -5,6 +5,7 @@
SUBDIRS = codebook
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
@@ -53,7 +54,7 @@ xineplug_decode_faad_la_SOURCES = \
xine_decoder.c
xineplug_decode_faad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_decode_faad_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB)
noinst_HEADERS = \
analysis.h \
@@ -86,6 +87,9 @@ noinst_HEADERS = \
syntax.h \
tns.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 5dea33a93..0068f18ad 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -11,15 +11,14 @@ EXTRA_DIST =
INTERNAL_DOCS = diff_to_ffmpeg_cvs.txt
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_ff.la
xineplug_decode_ff_la_SOURCES = xine_decoder.c
xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_decode_ff_la_LIBADD = \
- $(top_builddir)/src/xine-engine/libxine.la \
+xineplug_decode_ff_la_LIBADD = $(XINE_LIB) \
$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
debug:
@@ -38,3 +37,6 @@ maintainer-clean-generic:
-@echo "This command is intended for maintainers to use;"
-@echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in
+
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index 278bd22f3..5f1d1b64b 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -8,6 +8,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_mpeg2.la
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
#libmpeg2_la_SOURCES = slice.c header.c stats.c idct.c motion_comp.c\
# decode.c idct_mmx.c motion_comp_mmx.c
@@ -28,11 +29,14 @@ xineplug_decode_mpeg2_la_SOURCES = \
stats.c \
xine_decoder.c
-xineplug_decode_mpeg2_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB)
xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index 079d2bb8b..fd15735ef 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -3,13 +3,17 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_spucc.la
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c
-xineplug_decode_spucc_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_spucc_la_LIBADD = $(XINE_LIB)
xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = cc_decoder.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index a4e69a38c..99b397316 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -3,6 +3,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_spu.la
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
xineplug_decode_spu_la_SOURCES = \
nav_read.c \
@@ -10,12 +11,15 @@ xineplug_decode_spu_la_SOURCES = \
spu.c \
xine_decoder.c
-xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = spu.h nav_read.h bswap.h nav_print.h
include_HEADERS = spu_decoder_api.h nav_types.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index d1de190f2..b5f3fbc17 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -9,7 +9,7 @@ w32dll_codec = xineplug_decode_w32dll.la
endif
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
-
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
libdir = $(XINE_PLUGINDIR)
##
@@ -23,12 +23,15 @@ xineplug_decode_w32dll_la_SOURCES = w32codec.c
xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_w32dll_la_LIBADD = \
$(top_builddir)/src/libw32dll/wine/libwine.la \
- $(top_builddir)/src/xine-engine/libxine.la \
+ $(XINE_LIB) \
$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
@KSTAT_LIBS@
noinst_HEADERS = libwin32.h w32codec.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) $@) || exit;\
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 320f05b3b..1907a5fc5 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = fooaudio.c
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
SUBDIRS = gsm610
@@ -20,21 +21,24 @@ xineplug_decode_roqaudio_la_SOURCES = roqaudio.c
xineplug_decode_roqaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_adpcm_la_SOURCES = adpcm.c
-xineplug_decode_adpcm_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_adpcm_la_LIBADD = $(XINE_LIB)
xineplug_decode_adpcm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_logpcm_la_SOURCES = logpcm.c
-xineplug_decode_logpcm_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_logpcm_la_LIBADD = $(XINE_LIB)
xineplug_decode_logpcm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_gsm610_la_SOURCES = gsm610.c
xineplug_decode_gsm610_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_gsm610_la_LIBADD = \
- $(top_builddir)/src/xine-engine/libxine.la \
+ $(XINE_LIB) \
$(top_builddir)/src/libxineadec/gsm610/libgsm610.la
# noinst_HEADERS =
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index 92683c9a0..9b8f31b66 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = foovideo.c
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
-
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
lib_LTLIBRARIES = \
xineplug_decode_cinepak.la \
xineplug_decode_cyuv.la \
@@ -21,11 +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_LIBADD = $(XINE_LIB)
xineplug_decode_cinepak_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_cyuv_la_SOURCES = cyuv.c
-xineplug_decode_cyuv_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_cyuv_la_LIBADD = $(XINE_LIB)
xineplug_decode_cyuv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_msvc_la_SOURCES = msvc.c
@@ -38,7 +38,7 @@ xineplug_decode_svq1_la_SOURCES = svq1.c svq1_codebooks.h
xineplug_decode_svq1_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_fli_la_SOURCES = fli.c
-xineplug_decode_fli_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+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
@@ -51,7 +51,7 @@ xineplug_decode_msrle_la_SOURCES = msrle.c
xineplug_decode_msrle_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_idcinvideo_la_SOURCES = idcinvideo.c
-xineplug_decode_idcinvideo_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+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
@@ -68,6 +68,9 @@ xineplug_decode_qtrle_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = svq1_codebooks.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 83b8ae983..bead4f218 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -60,30 +60,31 @@ endif
# $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module) $(vidix_module) \
xineplug_vo_out_none.la
+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
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 \
- $(top_builddir)/src/xine-engine/libxine.la
+ $(XINE_LIB)
xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
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 \
- $(top_builddir)/src/xine-engine/libxine.la
+ $(XINE_LIB)
xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
# alphablend.c video_out_opengl.c
#xineplug_vo_out_opengl_la_LIBADD = $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \
-# $(top_builddir)/src/xine-engine/libxine.la
+# $(XINE_LIB)
#xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c
-#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la
+#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB)
#xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_vo_out_aa_la_SOURCES = video_out_aa.c
@@ -92,7 +93,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#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-engine/libxine.la
+#xineplug_vo_out_fb_la_LIBADD = $(XINE_LIB)
#xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
#xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
@@ -116,6 +117,9 @@ xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h
+$(XINE_LIB):
+ @cd $(top_builddir)/src/xine-engine && $(MAKE)
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 15a499fd1..5cdbd7140 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -6,6 +6,7 @@ AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) @ANSI_FLAGS@
lib_LTLIBRARIES = libxine.la
+XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
if HAVE_X11
nvtv = nvtvd.c tvmode.c
endif
@@ -14,14 +15,15 @@ libxine_la_SOURCES = $(nvtv) xine.c metronom.c configfile.c buffer.c \
load_plugins.c video_decoder.c buffer_types.c \
audio_decoder.c video_out.c audio_out.c resample.c events.c lrb.c \
video_overlay.c osd.c scratch.c locale.c demux.c vo_scale.c xine_interface.c
-libxine_la_DEPENDENCIES = @INTLLIBS@ $(top_builddir)/src/xine-utils/libxineutils.la
+libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB)
libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS)\
- -lm $(top_builddir)/src/xine-utils/libxineutils.la
+ -lm $(XINEUTILS_LIB)
libxine_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \
audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
lrb.h video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \
@@ -38,7 +40,8 @@ debug:
install-debug: debug
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
+$(XINEUTILS_LIB):
+ cd $(top_srcdir)/src/xine-utils; make
###
# Install header files (default=$includedir/xine)
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 9c2da098d..061260782 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: utils.c,v 1.9 2002/07/30 13:28:47 mroi Exp $
+ * $Id: utils.c,v 1.10 2002/11/22 05:25:17 storri Exp $
*
*/
#define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */
@@ -44,7 +44,7 @@ void *xine_xmalloc(size_t size) {
/* prevent xine_xmalloc(0) of possibly returning NULL */
if( !size )
size++;
-
+
if((ptr = calloc(1, size)) == NULL) {
fprintf(stderr, "%s: malloc() failed: %s.\n",
__XINE_FUNCTION__, strerror(errno));
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:03:20 +0000