diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 22:00:36 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 22:00:36 +0200 |
| commit | 54999f68a60f0f814566babb2df0f9a18089d149 (patch) | |
| tree | 788025437ea7ac2d2d775317a453a2ae7a4790a2 | |
| parent | 0045b338e45e2c23b0ec6c086e7cb289517831e4 (diff) | |
| download | xine-lib-54999f68a60f0f814566babb2df0f9a18089d149.tar.gz xine-lib-54999f68a60f0f814566babb2df0f9a18089d149.tar.bz2 | |
Move the linear pcm decoder from liblpcm to libxineadec, as it's a single file.
--HG--
rename : src/liblpcm/xine_decoder.c => src/libxineadec/xine_lpcm_decoder.c
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/liblpcm/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 19 | ||||
| -rw-r--r-- | src/libxineadec/xine_lpcm_decoder.c (renamed from src/liblpcm/xine_decoder.c) | 0 |
5 files changed, 9 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 17d477d5d..724b87ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -2638,7 +2638,6 @@ src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile -src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index df8e2d462..90f51ee50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ SUBDIRS = \ libdts \ libmad \ libw32dll \ - liblpcm \ libxinevdec \ libxineadec \ libvorbis \ diff --git a/src/liblpcm/Makefile.am b/src/liblpcm/Makefile.am deleted file mode 100644 index e8527ee5c..000000000 --- a/src/liblpcm/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = xineplug_decode_lpcm.la - -xineplug_decode_lpcm_la_SOURCES = xine_decoder.c -xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) -xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_lpcm_la_LDFLAGS = -avoid-version -module diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 82011dfd0..373347aaa 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -4,22 +4,21 @@ EXTRA_DIST = fooaudio.c SUBDIRS = gsm610 nosefart +AM_LDFLAGS = $(xineplug_ldflags) + xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ - xineplug_decode_nsf.la + xineplug_decode_nsf.la \ + xineplug_decode_lpcm.la xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_gsm610_la_LDFLAGS = $(xineplug_ldflags) -xineplug_decode_gsm610_la_LIBADD = \ - $(XINE_LIB) \ - $(top_builddir)/src/libxineadec/gsm610/libgsm610.la +xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la xineplug_decode_nsf_la_SOURCES = nsf.c xineplug_decode_nsf_la_CFLAGS = $(VISIBILITY_FLAG) -DNSF_PLAYER -fno-strict-aliasing -xineplug_decode_nsf_la_LDFLAGS = $(xineplug_ldflags) -xineplug_decode_nsf_la_LIBADD = -lm \ - $(XINE_LIB) \ - $(top_builddir)/src/libxineadec/nosefart/libnosefart.la +xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la -# noinst_HEADERS = +xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c +xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) diff --git a/src/liblpcm/xine_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 43bea4cbf..43bea4cbf 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c |