Final pass over decoders.m4

5 files changed, 10 insertions, 23 deletions

diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 0cfec1e89..b1e747bcc 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -16,7 +16,7 @@ if ENABLE_VORBIS
 ogg_module = xineplug_dmx_ogg.la
 endif
 
-if BUILD_ASF
+if ENABLE_ASF
 asf_module = xineplug_dmx_asf.la 
 endif
 
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index 9eec4f6d2..1025b373d 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -3,32 +3,19 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-noinst_HEADERS = \
-	a52.h \
-	a52_internal.h \
-	bitstream.h \
-	tables.h \
-	crc.c
+noinst_HEADERS = a52.h a52_internal.h bitstream.h tables.h crc.c
 
-if A52
+if ENABLE_A52DEC
 xineplug_LTLIBRARIES = xineplug_decode_a52.la
 endif
 
-if EXTERNAL_A52DEC
-internal_sources =
+if WITH_EXTERNAL_A52DEC
 external_libs = -la52
+internal_sources =
 else
-internal_sources = \
-	bitstream.c \
-	bit_allocate.c \
-	downmix.c \
-	imdct.c \
-	parse.c
 external_libs =
+internal_sources = bitstream.c bit_allocate.c downmix.c imdct.c parse.c
 endif
 
-xineplug_decode_a52_la_SOURCES = \
-	xine_a52_decoder.c \
-	$(internal_sources)
-
+xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c $(internal_sources)
 xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
index 5f4be9cd4..379033b15 100644
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -57,7 +57,7 @@ noinst_HEADERS = \
 	syntax.h \
 	tns.h 
 
-if BUILD_FAAD
+if ENABLE_FAAD
 xineplug_LTLIBRARIES = xineplug_decode_faad.la
 endif
 
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index a970c6d24..d772f0e09 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -29,4 +29,4 @@ xineplug_decode_mpeg2_la_SOURCES = \
 	libmpeg2_accel.c
 
 xineplug_decode_mpeg2_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm
-xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(LIBMPEG2_CFLAGS)
+xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS)
diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am
index 4e9e6305b..8c248fdcb 100644
--- a/src/libmpeg2new/Makefile.am
+++ b/src/libmpeg2new/Makefile.am
@@ -9,4 +9,4 @@ xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la
 
 xineplug_decode_mpeg2_la_SOURCES = xine_mpeg2_decoder.c
 xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) ./libmpeg2/libmpeg2.la 
-xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(LIBMPEG2_CFLAGS)
+xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS)