4 files changed, 16 insertions, 13 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 8433d4ce8..8ad34d968 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -7,7 +7,7 @@ CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 VISIBILITY_FLAG = @VISIBILITY_FLAG@
 
-if HAVE_DXR3
+if ENABLE_DXR3
 dxr3encoder = --enable-encoder=mpeg1video
 endif
 
diff --git a/contrib/libdca/Makefile.am b/contrib/libdca/Makefile.am
index 14206a363..faab0dd14 100644
--- a/contrib/libdca/Makefile.am
+++ b/contrib/libdca/Makefile.am
@@ -1,5 +1,9 @@
-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
@@ -8,8 +12,5 @@ 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_CFLAGS = -I$(srcdir)/include $(VISIBILITY_FLAG)
 libdca_la_LIBADD = -lm
-
-EXTRA_DIST = COPYING
+libdca_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
diff --git a/contrib/libmpcdec/Makefile.am b/contrib/libmpcdec/Makefile.am
index 16ea80c28..24e2c0157 100644
--- a/contrib/libmpcdec/Makefile.am
+++ b/contrib/libmpcdec/Makefile.am
@@ -1,5 +1,9 @@
-if MUSEPACK
-if !EXTERNAL_MPCDEC
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING
+
+if ENABLE_MUSEPACK
+if !WITH_EXTERNAL_LIBMPCDEC
 noinst_LTLIBRARIES = libmpcdec.la
 endif
 endif
@@ -9,6 +13,3 @@ libmpcdec_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c mpc_reader.c \
 	mpcdec/internal.h mpcdec/mpcdec.h mpcdec/streaminfo.h mpcdec/math.h \
 	mpcdec/decoder.h mpcdec/config_types.h mpcdec/requant.h mpcdec/huffman.h \
 	mpcdec/reader.h
-libmpcdec_la_CFLAGS = $(VISIBILITY_FLAG)
-
-EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING
diff --git a/contrib/libxdg-basedir/Makefile.am b/contrib/libxdg-basedir/Makefile.am
index 68f09b0a9..420d85999 100644
--- a/contrib/libxdg-basedir/Makefile.am
+++ b/contrib/libxdg-basedir/Makefile.am
@@ -2,5 +2,6 @@ if !EXTERNAL_LIBXDG_BASEDIR
 noinst_LTLIBRARIES = libxdg-basedir.la
 endif
 
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
 libxdg_basedir_la_SOURCES = basedir.c basedir.h
-libxdg_basedir_la_CFLAGS = $(VISIBILITY_FLAG)