Developers can now run "make" in their work area (e.g. src/libffmpeg) and it

will build all dependent parts (e.g. libxine.la). The directory must still
be prepared by running autogen.sh.

CVS patchset: 3331
CVS date: 2002/11/22 05:25:14

1 files changed, 31 insertions, 26 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)
 ##