3 files changed, 20 insertions, 16 deletions
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 08d1df3dc..474dda1a1 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -1,24 +1,25 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = fooaudio.c
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
 
 SUBDIRS = gsm610 nosefart
 
-AM_LDFLAGS = $(xineplug_ldflags)
+EXTRA_DIST = fooaudio.c
 
-if HAVE_VORBIS
+if ENABLE_VORBIS
 vorbis_module = xineplug_decode_vorbis.la
 endif
 
-if HAVE_SPEEX
+if ENABLE_SPEEX
 speex_module = xineplug_decode_speex.la
 endif
 
-if MUSEPACK
+if ENABLE_MUSEPACK
 musepack_module = xineplug_decode_mpc.la
 endif
 
-if DTS
+if ENABLE_DTS
 dts_module = xineplug_decode_dts.la
 endif
 
@@ -38,31 +39,30 @@ xineplug_LTLIBRARIES = \
 	$(dts_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
-xineplug_decode_gsm610_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
 
 xineplug_decode_nsf_la_SOURCES = nsf.c
-xineplug_decode_nsf_la_CFLAGS = $(VISIBILITY_FLAG) -DNSF_PLAYER -fno-strict-aliasing
 xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la
+xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER
 
 xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
-xineplug_decode_lpcm_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
 
 xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
 xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
-xineplug_decode_vorbis_la_CFLAGS = $(VISIBILITY_FLAG) $(VORBIS_CFLAGS)
+xineplug_decode_vorbis_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS)
 
 xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
 xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
-xineplug_decode_speex_la_CFLAGS = $(VISIBILITY_FLAGS) $(SPEEX_CFLAGS)
+xineplug_decode_speex_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS)
 
 xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
-xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) $(MPCDEC_CFLAGS)
 xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS)
 xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(MPCDEC_LIBS)
+xineplug_decode_mpc_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS)
 
 xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c
-xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG)
 xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS)
 xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
+xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS)
diff --git a/src/libxineadec/gsm610/Makefile.am b/src/libxineadec/gsm610/Makefile.am
index fe25ad9c3..f2011dfd4 100644
--- a/src/libxineadec/gsm610/Makefile.am
+++ b/src/libxineadec/gsm610/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
 noinst_LTLIBRARIES = libgsm610.la
 
 libgsm610_la_SOURCES = \
@@ -14,8 +17,6 @@ libgsm610_la_SOURCES = \
 	short_term.c \
 	table.c
 
-libgsm610_la_CFLAGS = $(VISIBILITY_FLAG)
-libgsm610_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = \
 	gsm_config.h \
diff --git a/src/libxineadec/nosefart/Makefile.am b/src/libxineadec/nosefart/Makefile.am
index 51cc3f238..83c04a28d 100644
--- a/src/libxineadec/nosefart/Makefile.am
+++ b/src/libxineadec/nosefart/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
 noinst_LTLIBRARIES = libnosefart.la
 
 libnosefart_la_SOURCES = \
@@ -15,7 +17,8 @@ libnosefart_la_SOURCES = \
 	nsf.c \
 	vrcvisnd.c	
 
-libnosefart_la_CFLAGS = $(VISIBILITY_FLAG) -DNSF_PLAYER -fno-strict-aliasing
+libnosefart_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+libnosefart_la_CPPFLAGS = -DNSF_PLAYER
 
 noinst_HEADERS = \
 	dis6502.h \