2 files changed, 80 insertions, 14 deletions
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
index 98053ea21..24c816bb1 100644
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -16,20 +16,75 @@ lib_LTLIBRARIES = $(faad_module)
 
 VPATH = @srcdir@:@srcdir@/codebook:
 
-xineplug_decode_faad_la_SOURCES = xine_decoder.c \
-	bits.c data.c decoder.c drc.c error.c filtbank.c rvlc_scale_factors.c \
-	ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \
-	pulse.c specrec.c syntax.c tns.c reordered_spectral_data.c cfft.c \
-	hcb_1.c hcb_2.c hcb_3.c hcb_4.c hcb_5.c hcb_6.c hcb_7.c hcb_8.c \
-	hcb_9.c hcb_10.c hcb_11.c hcb_sf.c
+xineplug_decode_faad_la_SOURCES = \
+	bits.c \
+	cfft.c \
+	data.c \
+	decoder.c \
+	drc.c \
+	error.c \
+	filtbank.c \
+	codebook/hcb_1.c \
+	codebook/hcb_2.c \
+	codebook/hcb_3.c \
+	codebook/hcb_4.c \
+	codebook/hcb_5.c \
+	codebook/hcb_6.c \
+	codebook/hcb_7.c \
+	codebook/hcb_8.c \
+	codebook/hcb_9.c \
+	codebook/hcb_10.c \
+	codebook/hcb_11.c \
+	codebook/hcb_sf.c \
+	ic_predict.c \
+	is.c \
+	lt_predict.c \
+	mdct.c \
+	mp4.c \
+	ms.c \
+	output.c \
+	pns.c \
+	pulse.c \
+	reordered_spectral_data.c \
+	rvlc_scale_factors.c \
+	specrec.c \
+	syntax.c \
+	tns.c \
+	xine_decoder.c
+
 xineplug_decode_faad_la_LDFLAGS = -avoid-version -module
-xineplug_decode_faad_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_decode_faad_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 
-noinst_HEADERS = analysis.h bits.h common.h data.h decoder.h drc.h error.h \
-		 filtbank.h huffman.h ic_predict.h is.h kbd_win.h cfft.h \
-		 lt_predict.h mdct.h mp4.h ms.h output.h pns.h pulse.h \
-		 sbr_dec.h sbr_huff.h sbr_qmf.h sbr_syntax.h rvlc_scale_factors.h \
-		 specrec.h syntax.h tns.h codebook/hcb.h faad.h 
+noinst_HEADERS = \
+	analysis.h \
+	bits.h \
+	cfft.h \
+	common.h \
+	data.h \
+	decoder.h \
+	drc.h \
+	error.h \
+	faad.h  \
+	filtbank.h \
+	huffman.h \
+	ic_predict.h \
+	is.h \
+	kbd_win.h \
+	lt_predict.h \
+	mdct.h \
+	mp4.h \
+	ms.h \
+	output.h \
+	pns.h \
+	pulse.h \
+	rvlc_scale_factors.h \
+	sbr_dec.h \
+	sbr_huff.h \
+	sbr_qmf.h \
+	sbr_syntax.h \
+	specrec.h \
+	syntax.h \
+	tns.h 
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
diff --git a/src/libfaad/codebook/Makefile.am b/src/libfaad/codebook/Makefile.am
index 5dfd923d0..af2e85b18 100644
--- a/src/libfaad/codebook/Makefile.am
+++ b/src/libfaad/codebook/Makefile.am
@@ -1,5 +1,16 @@
-EXTRA_DIST = hcb.h hcb_1.c hcb_2.c hcb_3.c hcb_4.c hcb_5.c hcb_6.c hcb_7.c hcb_8.c hcb_9.c \
-	hcb_10.c hcb_11.c hcb_sf.c 
+EXTRA_DIST = hcb.h \
+	hcb_1.c \
+	hcb_2.c \
+	hcb_3.c \
+	hcb_4.c \
+	hcb_5.c \
+	hcb_6.c \
+	hcb_7.c \
+	hcb_8.c \
+	hcb_9.c \
+	hcb_10.c \
+	hcb_11.c \
+	hcb_sf.c 
 
 all:
 debug: