From 4b97c5dc4ef7cc049c18f9636859d341eeb531c5 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Fri, 22 Nov 2002 05:25:14 +0000 Subject: 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 --- src/xine-engine/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/xine-engine') 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) -- cgit v1.2.3