summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libxineadec/Makefile.am14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 8ed5a8860..21cf6eefc 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -18,18 +18,9 @@ if MUSEPACK
musepack_module = xineplug_decode_mpc.la
endif
-if !EXTERNAL_MPCDEC
-link_libmpcdec = $(top_builddir)/contrib/libmpcdec/libmpcdec.la
-cflags_libmpcdec = -I$(top_srcdir)/contrib/libmpcdec
-
$(top_builddir)/contrib/libmpcdec/libmpcdec.la:
$(MAKE) -C $(top_builddir)/contrib/libmpcdec
-else
-link_libmpcdec = $(MPCDEC_LIBS)
-cflags_libmpcdec = $(MPCDEC_CFLAGS)
-endif
-
xineplug_LTLIBRARIES = \
xineplug_decode_gsm610.la \
xineplug_decode_nsf.la \
@@ -59,6 +50,7 @@ xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
xineplug_decode_speex_la_CFLAGS = $(VISIBILITY_FLAGS) $(SPEEX_CFLAGS)
xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
-xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) $(cflags_libmpcdec)
-xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(link_libmpcdec)
+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_LDFLAGS = $(xineplug_ldflags)