From 0045b338e45e2c23b0ec6c086e7cb289517831e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 4 Apr 2007 21:21:26 +0200 Subject: Convert to xineplug_LTLIBRARIES. --- src/libxineadec/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libxineadec/Makefile.am') diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 7f34b4bfd..82011dfd0 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -2,24 +2,22 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooaudio.c -libdir = $(XINE_PLUGINDIR) - SUBDIRS = gsm610 nosefart -lib_LTLIBRARIES = \ +xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_nsf.la xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_gsm610_la_LDFLAGS = -avoid-version -module +xineplug_decode_gsm610_la_LDFLAGS = $(xineplug_ldflags) xineplug_decode_gsm610_la_LIBADD = \ $(XINE_LIB) \ $(top_builddir)/src/libxineadec/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 = -avoid-version -module +xineplug_decode_nsf_la_LDFLAGS = $(xineplug_ldflags) xineplug_decode_nsf_la_LIBADD = -lm \ $(XINE_LIB) \ $(top_builddir)/src/libxineadec/nosefart/libnosefart.la -- cgit v1.2.3 From 54999f68a60f0f814566babb2df0f9a18089d149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 4 Apr 2007 22:00:36 +0200 Subject: 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 --- src/libxineadec/Makefile.am | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/libxineadec/Makefile.am') 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) -- cgit v1.2.3 From cbcc2cc3c185b5799f34a7918b44b743a70decab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 4 Apr 2007 22:05:54 +0200 Subject: Move the Vorbis decoder from libvorbis to libxineadec, as it's a single file. --HG-- rename : src/libvorbis/xine_decoder.c => src/libxineadec/xine_vorbis_decoder.c --- src/libxineadec/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/libxineadec/Makefile.am') diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 373347aaa..f2e3b4aa0 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -6,10 +6,15 @@ SUBDIRS = gsm610 nosefart AM_LDFLAGS = $(xineplug_ldflags) +if HAVE_VORBIS +vorbis_module = xineplug_decode_vorbis.la +endif + xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_nsf.la \ - xineplug_decode_lpcm.la + xineplug_decode_lpcm.la \ + $(vorbis_module) xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) @@ -22,3 +27,7 @@ xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) + +xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c +xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS) +xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS) -- cgit v1.2.3 From 63707aa6026241c7040b8cee59032aed10559e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 4 Apr 2007 22:18:45 +0200 Subject: Move the Speex decoder from libspeex to libxineadec, as it's a single file. --HG-- rename : src/libspeex/xine_decoder.c => src/libxineadec/xine_speex_decoder.c --- src/libxineadec/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/libxineadec/Makefile.am') diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index f2e3b4aa0..b2ffcf078 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -10,11 +10,16 @@ if HAVE_VORBIS vorbis_module = xineplug_decode_vorbis.la endif +if HAVE_SPEEX +speex_module = xineplug_decode_speex.la +endif + xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_nsf.la \ xineplug_decode_lpcm.la \ - $(vorbis_module) + $(vorbis_module) \ + $(speex_module) xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG) @@ -31,3 +36,7 @@ xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS) xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS) + +xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c +xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS) +xineplug_decode_speex_la_CFLAGS = $(VISIBILITY_FLAGS) $(SPEEX_CFLAGS) -- cgit v1.2.3