From 67b0ebb21185cb8ea2972dead6870bab8306724e Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Fri, 11 May 2007 19:28:18 -0400
Subject: Another round of Makefile.am cleanups

---
 src/liba52/Makefile.am | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/liba52')

diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index 948a7ab28..9eec4f6d2 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -1,16 +1,22 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
+noinst_HEADERS = \
+	a52.h \
+	a52_internal.h \
+	bitstream.h \
+	tables.h \
+	crc.c
+
 if A52
-a52_module = xineplug_decode_a52.la
+xineplug_LTLIBRARIES = xineplug_decode_a52.la
 endif
 
-xineplug_LTLIBRARIES = $(a52_module)
-
 if EXTERNAL_A52DEC
 internal_sources =
+external_libs = -la52
 else
 internal_sources = \
 	bitstream.c \
@@ -18,21 +24,11 @@ internal_sources = \
 	downmix.c \
 	imdct.c \
 	parse.c
+external_libs =
 endif
 
 xineplug_decode_a52_la_SOURCES = \
 	xine_a52_decoder.c \
 	$(internal_sources)
 
-if EXTERNAL_A52DEC
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm
-else
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm
-endif
-
-noinst_HEADERS = \
-	a52.h \
-	a52_internal.h \
-	bitstream.h \
-	tables.h \
-	crc.c
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm
-- 
cgit v1.2.3