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, 13 insertions, 9 deletions

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)
 ##