summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/xine-config.in2
-rw-r--r--src/audio_out/Makefile.am14
-rw-r--r--src/demuxers/Makefile.am13
-rw-r--r--src/dxr3/Makefile.am3
-rw-r--r--src/input/Makefile.am8
-rw-r--r--src/liba52/Makefile.am1
-rw-r--r--src/libdivx4/Makefile.am1
-rw-r--r--src/libdts/Makefile.am2
-rw-r--r--src/libffmpeg/Makefile.am3
-rw-r--r--src/liblpcm/Makefile.am2
-rw-r--r--src/libmad/Makefile.am2
-rw-r--r--src/libmpeg2/Makefile.am1
-rw-r--r--src/libspudec/Makefile.am2
-rw-r--r--src/libvfill/Makefile.am1
-rw-r--r--src/libvorbis/Makefile.am3
-rw-r--r--src/libw32dll/Makefile.am2
-rw-r--r--src/video_out/Makefile.am7
-rw-r--r--src/xine-engine/Makefile.am3
18 files changed, 22 insertions, 48 deletions
diff --git a/misc/xine-config.in b/misc/xine-config.in
index 162767a89..13de1a352 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -92,7 +92,7 @@ if test "$echo_cflags" = "yes"; then
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -lxine @THREAD_LIBS@
+ echo -L@libdir@ -lxineutils -lxine @THREAD_LIBS@
fi
if test "$echo_plugindir" = "yes"; then
echo "@XINE_PLUGINPATH@"
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 07fe7e799..0a2324b00 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -53,37 +53,35 @@ lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(esd_module) $(sun_module) $(art
$(alsa05_module) $(irixal_module)
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
-xineplug_ao_out_oss_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c
-xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS)
xineplug_ao_out_alsa05_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
-xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS)
xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c
-xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
-xineplug_ao_out_sun_la_LIBADD = $(IRIXAL_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_sun_la_LIBADD = $(IRIXAL_LIBS)
xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c
-xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c
-xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = audio_oss_out.h audio_alsa_out.h audio_esd_out.h \
audio_sun_out.h audio_arts_out.h audio_irixal_out.h
-
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 77b017c9a..b885d196e 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -21,7 +21,7 @@ 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@ $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@
xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module
xineplug_dmx_avi_la_SOURCES = demux_avi.c
@@ -29,35 +29,30 @@ 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_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-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 $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_dmx_mpeg_audio_la_LIBADD = -lm
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 $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_dmx_qt_la_LIBADD = -lz
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
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index a171d1fca..16619413e 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -14,11 +14,10 @@ lib_LTLIBRARIES = $(dxr3_modules)
xineplug_decode_dxr3_la_SOURCES = dxr3_decoder.c
xineplug_decode_dxr3_la_LDFLAGS = -avoid-version -module
-xineplug_decode_dxr3_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_dxr3_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c overlay.c
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module $(X_LIBS)
-xineplug_vo_out_dxr3_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
include_HEADERS = dxr3_overlay.h
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index c79c1d5ca..bfcc86c7b 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -24,33 +24,27 @@ lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) \
xineplug_inp_rtp.la
xineplug_inp_file_la_SOURCES = input_file.c
-xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.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-utils/libxineutils.la
xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
xineplug_inp_net_la_SOURCES = input_net.c
-xineplug_inp_net_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_inp_net_la_LDFLAGS = -avoid-version -module
xineplug_inp_vcd_la_SOURCES = input_vcd.c
-xineplug_inp_vcd_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module
xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c
-xineplug_inp_stdin_fifo_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.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-utils/libxineutils.la
xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module
include_HEADERS = input_plugin.h
noinst_HEADERS = dvd_udf.h read_cache.h
-EXTRA_DIST = input_dvd.c dvd_udf.c input_vcd.c read_cache.c
+EXTRA_DIST = input_dvd.c dvd_udf.c input_vcd.c read_cache.c
##
## Install header files (default=$includedir/xine)
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index ac03c97aa..81e457c54 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -12,7 +12,6 @@ xineplug_decode_a52_la_SOURCES = bitstream.c bit_allocate.c \
parse.c downmix.c imdct.c imdct_mlib.c \
xine_decoder.c
xineplug_decode_a52_la_LDFLAGS = -avoid-version -module
-xineplug_decode_a52_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS = a52.h a52_internal.h \
bitstream.h tables.h
diff --git a/src/libdivx4/Makefile.am b/src/libdivx4/Makefile.am
index 3ad16baef..7cd8b7b56 100644
--- a/src/libdivx4/Makefile.am
+++ b/src/libdivx4/Makefile.am
@@ -12,7 +12,6 @@ lib_LTLIBRARIES = xineplug_decode_divx4.la
xineplug_decode_divx4_la_SOURCES = xine_decoder.c
xineplug_decode_divx4_la_LDFLAGS = -avoid-version -module
-xineplug_decode_divx4_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS = decore-if.h
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am
index 719daac06..e92c32413 100644
--- a/src/libdts/Makefile.am
+++ b/src/libdts/Makefile.am
@@ -8,11 +8,9 @@ lib_LTLIBRARIES = xineplug_decode_dts.la
xineplug_decode_dts_la_SOURCES = xine_decoder.c
xineplug_decode_dts_la_LDFLAGS = -avoid-version -module
-xineplug_decode_dts_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS =
-
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index f4d21c7c7..d77e3ad04 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -13,9 +13,6 @@ libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_ff.la
xineplug_decode_ff_la_SOURCES = xine_decoder.c
-
-xineplug_decode_ff_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
-
xineplug_decode_ff_la_LDFLAGS = \
$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
-avoid-version -module
diff --git a/src/liblpcm/Makefile.am b/src/liblpcm/Makefile.am
index 2e576650f..d55dcf5b4 100644
--- a/src/liblpcm/Makefile.am
+++ b/src/liblpcm/Makefile.am
@@ -8,11 +8,9 @@ lib_LTLIBRARIES = xineplug_decode_lpcm.la
xineplug_decode_lpcm_la_SOURCES = xine_decoder.c
xineplug_decode_lpcm_la_LDFLAGS = -avoid-version -module
-xineplug_decode_lpcm_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS =
-
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index d3f295a8f..f771ef370 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -11,14 +11,12 @@ xineplug_decode_mad_la_SOURCES = bit.c frame.c layer3.c timer.c \
xineplug_decode_mad_la_LDFLAGS = -avoid-version -module
-xineplug_decode_mad_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS = D.dat huffman.h mad.h stream.h fixed.h \
imdct_s.dat qc_table.dat synth.h bit.h frame.h layer12.h \
rq_table.dat timer.h global.h layer3.h sf_table.dat
-
##
## Install header files (default=$includedir/xine)
##
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index 5a63a0e71..cf093d802 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -16,7 +16,6 @@ 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 xine_decoder.c
xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module
-xineplug_decode_mpeg2_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index a9246e112..6db4b63ad 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = xineplug_decode_spu.la
xineplug_decode_spu_la_SOURCES = spu.c xine_decoder.c
xineplug_decode_spu_la_LDFLAGS = -avoid-version -module
-xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la $(top_builddir)/src/xine-engine/libxine.la
+xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
noinst_HEADERS = spu.h
include_HEADERS = spu_decoder_api.h
diff --git a/src/libvfill/Makefile.am b/src/libvfill/Makefile.am
index dcfd8b886..4548b4c72 100644
--- a/src/libvfill/Makefile.am
+++ b/src/libvfill/Makefile.am
@@ -10,7 +10,6 @@ libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_vfill.la
xineplug_decode_vfill_la_SOURCES = xine_decoder.c
-xineplug_decode_vfill_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
xineplug_decode_vfill_la_LDFLAGS = -avoid-version -module
# noinst_HEADERS =
diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am
index 70216225f..ea5e6e04b 100644
--- a/src/libvorbis/Makefile.am
+++ b/src/libvorbis/Makefile.am
@@ -15,10 +15,9 @@ endif
lib_LTLIBRARIES = $(vorbis_module)
xineplug_decode_vorbis_la_SOURCES = xine_decoder.c
-xineplug_decode_vorbis_la_LIBADD = @VORBIS_LIBS@ $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_decode_vorbis_la_LIBADD = @VORBIS_LIBS@
xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module
-
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @OGG_CFLAGS@ @VORBIS_CFLAGS@"
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 83a8df279..5012c03f4 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -19,7 +19,7 @@ lib_LTLIBRARIES = $(w32dll_codec)
xineplug_decode_w32dll_la_SOURCES = w32codec.c
xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module
-xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la @KSTAT_LIBS@ $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la @KSTAT_LIBS@
noinst_HEADERS = w32codec.h
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 2d3eeab22..490b77304 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -26,20 +26,19 @@ endif
lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) $(aa_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 $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext
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 $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_vo_out_xshm_la_LIBADD = $(X_LIBS) -lXext
xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c
-xineplug_vo_out_syncfb_la_LIBADD = $(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
-xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = yuv2rgb.h video_out_syncfb.h alphablend.h deinterlace.h
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index b04c5c736..6a6eb68fb 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -25,6 +25,9 @@ include_HEADERS = buffer.h metronom.h configfile.h \
noinst_HEADERS = bswap.h
+$(top_builddir)/src/xine-utils/libxineutils.la:
+ @cd $(top_builddir)/src/xine-utils && make libxineutils.la
+
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:20:43 +0000