From e389c4ef330c2deb5d218298dd8bb50b5401bbd4 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Wed, 30 Apr 2003 16:49:33 +0000 Subject: * when NOT using a standalone libdvdnav, we do NOT have to link the whole libdvdnav into the spu decoder plugin statically, only nav_read.c is needed (read: revert to old linking behaviour for included libdvdnav) * beautification CVS patchset: 4724 CVS date: 2003/04/30 16:49:33 --- src/libspudec/Makefile.am | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/libspudec/Makefile.am') diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index a9114356a..6480f6788 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -2,25 +2,27 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR) -# For DVD -if HAVE_DVDNAV -DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ - $(DVDNAV_CFLAGS) -link_dvdnav = $(DVDNAV_LIBS) -else -DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ - -I$(top_srcdir)/src/input/libdvdnav/ -link_dvdnav = $(top_srcdir)/src/input/libdvdnav/libdvdnav.la -endif - lib_LTLIBRARIES = xineplug_decode_spu.la XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +if HAVE_DVDNAV + +xineplug_decode_spu_la_SOURCES = \ + spu.c \ + xine_decoder.c +xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) + +else + xineplug_decode_spu_la_SOURCES = \ + nav_read.c \ spu.c \ xine_decoder.c +AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav +xineplug_decode_spu_la_LIBADD = $(XINE_LIB) + +endif -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(link_dvdnav) xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = spu.h -- cgit v1.2.3