diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 18:11:52 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 18:11:52 +0200 |
| commit | 44c96dc8c74791c6f2884ad3268a4657dd87cb81 (patch) | |
| tree | 8daddc53ea1ca754b46520deb347add5d91d3965 | |
| parent | 1ae85c23560a870d34edaafd76b2cb64b9b95c93 (diff) | |
| download | xine-lib-44c96dc8c74791c6f2884ad3268a4657dd87cb81.tar.gz xine-lib-44c96dc8c74791c6f2884ad3268a4657dd87cb81.tar.bz2 | |
Now that xine_dts_decoder.c is alone, move it in libxineadec.
--HG--
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libdts/Makefile.am | 16 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 16 | ||||
| -rw-r--r-- | src/libxineadec/xine_dts_decoder.c (renamed from src/libdts/xine_dts_decoder.c) | 0 |
5 files changed, 14 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 8436f7a43..0dfb10fb7 100644 --- a/configure.ac +++ b/configure.ac @@ -2628,7 +2628,6 @@ src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile -src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 65c55c963..fa34861ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,6 @@ SUBDIRS = \ libspucmml \ libspudvb \ libsputext \ - libdts \ libmad \ libw32dll \ libxinevdec \ diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am deleted file mode 100644 index c142d3945..000000000 --- a/src/libdts/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -if DTS -dts_module = xineplug_decode_dts.la -endif - -$(top_builddir)/contrib/libdca/libdca.la: - $(MAKE) -C $(top_builddir)/contrib/libdca - -xineplug_LTLIBRARIES = $(dts_module) - -xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c -xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG) -xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS) -xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) -xineplug_decode_dts_la_LDFLAGS = $(xineplug_ldflags) diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 21cf6eefc..08d1df3dc 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -18,16 +18,24 @@ if MUSEPACK musepack_module = xineplug_decode_mpc.la endif +if DTS +dts_module = xineplug_decode_dts.la +endif + $(top_builddir)/contrib/libmpcdec/libmpcdec.la: $(MAKE) -C $(top_builddir)/contrib/libmpcdec +$(top_builddir)/contrib/libdca/libdca.la: + $(MAKE) -C $(top_builddir)/contrib/libdca + xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_nsf.la \ xineplug_decode_lpcm.la \ $(vorbis_module) \ $(speex_module) \ - $(musepack_module) + $(musepack_module) \ + $(dts_module) xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) @@ -53,4 +61,8 @@ xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) $(MPCDEC_CFLAGS) xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS) xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(MPCDEC_LIBS) -xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags) + +xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c +xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG) +xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS) +xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) diff --git a/src/libdts/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index 920672cf9..920672cf9 100644 --- a/src/libdts/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c |