diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
| commit | b0607c580af756ff0ccd1229d91b4b6a97c76d24 (patch) | |
| tree | 27f64134720fc9dca224e6313b0505fa43cb8dd8 /src/libspudec | |
| parent | fe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff) | |
| parent | adebccc0fc011b6d1abe2f682bbfc866dffee73e (diff) | |
| download | xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2 | |
Merge -newbuild.
Diffstat (limited to 'src/libspudec')
| -rw-r--r-- | src/libspudec/Makefile.am | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index 208d994f5..62de3774d 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -1,26 +1,21 @@ include $(top_srcdir)/misc/Makefile.common -xineplug_LTLIBRARIES = xineplug_decode_spu.la +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav +AM_LDFLAGS = $(xineplug_ldflags) -if HAVE_DVDNAV +noinst_HEADERS = spu.h -xineplug_decode_spu_la_SOURCES = \ - spu.c \ - xine_spu_decoder.c -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) $(PTHREAD_LIBS) +xineplug_LTLIBRARIES = xineplug_decode_spu.la +if WITH_EXTERNAL_DVDNAV +external_dvdnav_libs = $(DVDNAV_LIBS) +internal_dvdnav_sources = else - -xineplug_decode_spu_la_SOURCES = \ - nav_read.c \ - spu.c \ - xine_spu_decoder.c -AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) - +external_dvdnav_libs = +internal_dvdnav_sources = nav_read.c endif -xineplug_decode_spu_la_CFLAGS = $(DVDNAV_CFLAGS) $(VISIBILITY_FLAG) -xineplug_decode_spu_la_LDFLAGS = $(xineplug_ldflags) - -noinst_HEADERS = spu.h +xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spu.c xine_spu_decoder.c +xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS) +xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) |