From aa6b402b7a240b6f55c063b021c5c211f46ec8bd Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Sat, 12 May 2007 14:18:38 -0400
Subject: More configure/Makefile cleanups

-- Make a pass at cleaning up contrib/ Makefile.am files
-- Rename many AM_CONDITIONALS for consistency and give them better names to
   better indicate what they mean
-- Remove some dead input plugin tests
-- Clean up AM_PATH_DVDNAV
---
 contrib/libdca/Makefile.am | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'contrib/libdca')

diff --git a/contrib/libdca/Makefile.am b/contrib/libdca/Makefile.am
index a118a9dc9..faab0dd14 100644
--- a/contrib/libdca/Makefile.am
+++ b/contrib/libdca/Makefile.am
@@ -1,17 +1,16 @@
-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
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-
 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_CPPFLAGS = -I$(srcdir)/include
 libdca_la_LIBADD = -lm
-
-EXTRA_DIST = COPYING
+libdca_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
-- 
cgit v1.2.3