summaryrefslogtreecommitdiff
path: root/contrib/libmpcdec
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-05-31 14:08:52 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-05-31 14:08:52 +0100
commitb0607c580af756ff0ccd1229d91b4b6a97c76d24 (patch)
tree27f64134720fc9dca224e6313b0505fa43cb8dd8 /contrib/libmpcdec
parentfe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff)
parentadebccc0fc011b6d1abe2f682bbfc866dffee73e (diff)
downloadxine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz
xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2
Merge -newbuild.
Diffstat (limited to 'contrib/libmpcdec')
-rw-r--r--contrib/libmpcdec/Makefile.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/libmpcdec/Makefile.am b/contrib/libmpcdec/Makefile.am
index 16ea80c28..24e2c0157 100644
--- a/contrib/libmpcdec/Makefile.am
+++ b/contrib/libmpcdec/Makefile.am
@@ -1,5 +1,9 @@
-if MUSEPACK
-if !EXTERNAL_MPCDEC
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING
+
+if ENABLE_MUSEPACK
+if !WITH_EXTERNAL_LIBMPCDEC
noinst_LTLIBRARIES = libmpcdec.la
endif
endif
@@ -9,6 +13,3 @@ libmpcdec_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c mpc_reader.c \
mpcdec/internal.h mpcdec/mpcdec.h mpcdec/streaminfo.h mpcdec/math.h \
mpcdec/decoder.h mpcdec/config_types.h mpcdec/requant.h mpcdec/huffman.h \
mpcdec/reader.h
-libmpcdec_la_CFLAGS = $(VISIBILITY_FLAG)
-
-EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING