summaryrefslogtreecommitdiff
path: root/src/libxineadec/Makefile.am
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 18:59:44 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 18:59:44 +0200
commitf8057e9c31400721e7d02ea07728fbb8bd86ec2b (patch)
treee16e7d7bc002cac5c25d586ca6c861d78d718da8 /src/libxineadec/Makefile.am
parenta8bb7140826c99ee2448695058146ec265b6e4e6 (diff)
downloadxine-lib-f8057e9c31400721e7d02ea07728fbb8bd86ec2b.tar.gz
xine-lib-f8057e9c31400721e7d02ea07728fbb8bd86ec2b.tar.bz2
Move gsm610 sources inside contrib/.
--HG-- rename : src/libxineadec/gsm610/Makefile.am => contrib/gsm610/Makefile.am rename : src/libxineadec/gsm610/add.c => contrib/gsm610/add.c rename : src/libxineadec/gsm610/decode.c => contrib/gsm610/decode.c rename : src/libxineadec/gsm610/gsm.h => contrib/gsm610/gsm.h rename : src/libxineadec/gsm610/gsm_config.h => contrib/gsm610/gsm_config.h rename : src/libxineadec/gsm610/gsm_create.c => contrib/gsm610/gsm_create.c rename : src/libxineadec/gsm610/gsm_decode.c => contrib/gsm610/gsm_decode.c rename : src/libxineadec/gsm610/gsm_destroy.c => contrib/gsm610/gsm_destroy.c rename : src/libxineadec/gsm610/long_term.c => contrib/gsm610/long_term.c rename : src/libxineadec/gsm610/lpc.c => contrib/gsm610/lpc.c rename : src/libxineadec/gsm610/private.h => contrib/gsm610/private.h rename : src/libxineadec/gsm610/proto.h => contrib/gsm610/proto.h rename : src/libxineadec/gsm610/rpe.c => contrib/gsm610/rpe.c rename : src/libxineadec/gsm610/short_term.c => contrib/gsm610/short_term.c rename : src/libxineadec/gsm610/table.c => contrib/gsm610/table.c rename : src/libxineadec/gsm610/unproto.h => contrib/gsm610/unproto.h
Diffstat (limited to 'src/libxineadec/Makefile.am')
-rw-r--r--src/libxineadec/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 3bc08f320..25d1e358a 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -3,8 +3,6 @@ include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
AM_LDFLAGS = $(xineplug_ldflags)
-SUBDIRS = gsm610
-
EXTRA_DIST = fooaudio.c
if ENABLE_VORBIS
@@ -29,6 +27,9 @@ $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
$(top_builddir)/contrib/libdca/libdca.la:
$(MAKE) -C $(top_builddir)/contrib/libdca
+$(top_builddir)/contrib/gsm610/libgsm610.la:
+ $(MAKE) -C $(top_builddir)/contrib/gsm610
+
xineplug_LTLIBRARIES = \
xineplug_decode_gsm610.la \
xineplug_decode_lpcm.la \
@@ -38,7 +39,8 @@ xineplug_LTLIBRARIES = \
$(dts_module)
xineplug_decode_gsm610_la_SOURCES = gsm610.c
-xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
+xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
+xineplug_decode_gsm610_la_CPPFLAGS = -I$(top_srcdir)/contrib/gsm610
xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)