From b82a1365fcbfb32c4e24dfdc607b685d09c4d520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 16:55:55 +0200 Subject: Create a single NSF plugin that includes both the demuxer (previously in the audio group) and the decoder. One of the two plugins without the other would be useless. --HG-- rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c --- src/libxineadec/Makefile.am | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/libxineadec/Makefile.am') diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 6ea2171ee..3bc08f320 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -29,12 +29,8 @@ $(top_builddir)/contrib/libmpcdec/libmpcdec.la: $(top_builddir)/contrib/libdca/libdca.la: $(MAKE) -C $(top_builddir)/contrib/libdca -$(top_builddir)/contrib/nosefart/libnosefart.la: - $(MAKE) -C $(top_builddir)/contrib/nosefart - xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ - xineplug_decode_nsf.la \ xineplug_decode_lpcm.la \ $(vorbis_module) \ $(speex_module) \ @@ -44,11 +40,6 @@ xineplug_LTLIBRARIES = \ xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la -xineplug_decode_nsf_la_SOURCES = nsf.c -xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefart.la -lm -xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER -I$(top_srcdir)/contrib/nosefart - xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) -- cgit v1.2.3