summaryrefslogtreecommitdiff
path: root/contrib/libdca
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/libdca
parentfe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff)
parentadebccc0fc011b6d1abe2f682bbfc866dffee73e (diff)
downloadxine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz
xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2
Merge -newbuild.
Diffstat (limited to 'contrib/libdca')
-rw-r--r--contrib/libdca/Makefile.am13
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/libdca/Makefile.am b/contrib/libdca/Makefile.am
index 14206a363..faab0dd14 100644
--- a/contrib/libdca/Makefile.am
+++ b/contrib/libdca/Makefile.am
@@ -1,5 +1,9 @@
-if DTS
-if !EXTERNAL_LIBDTS
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+EXTRA_DIST = COPYING
+
+if ENABLE_DTS
+if !WITH_EXTERNAL_LIBDTS
noinst_LTLIBRARIES = libdca.la
endif
endif
@@ -8,8 +12,5 @@ libdca_la_SOURCES = dca_internal.h tables.h tables_quantization.h \
tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h \
bitstream.h bitstream.c parse.c downmix.c \
include/dca.h include/dts.h
-
-libdca_la_CFLAGS = -I$(srcdir)/include $(VISIBILITY_FLAG)
libdca_la_LIBADD = -lm
-
-EXTRA_DIST = COPYING
+libdca_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include