diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-16 00:38:07 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-16 00:38:07 +0200 |
| commit | 7604f551c91343371d13cd10fd66ab8c09208ff6 (patch) | |
| tree | f629ec651fe6d20ea1cb4f6b452e5bb5046e1673 | |
| parent | f7580352761cd972e8b345ad144a88c05be3eadd (diff) | |
| download | xine-lib-7604f551c91343371d13cd10fd66ab8c09208ff6.tar.gz xine-lib-7604f551c91343371d13cd10fd66ab8c09208ff6.tar.bz2 | |
Simplify handling of internal/external libmpcdec, most of the work is done at configure time.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index a20f64a21..c4799d04e 100644 --- a/configure.ac +++ b/configure.ac @@ -1290,9 +1290,13 @@ elif test "x$with_external_libmpcdec" = "xyes"; then MPCDEC_CFLAGS="" else AC_MSG_RESULT([Use included libmusepack]) + MPCDEC_CFLAGS='-I$(top_srcdir)/contrib/libmpcdec' + MPCDEC_LIBS='$(top_builddir)/contrib/libmpcdec/libmpcdec.la' + MPCDEC_DEPS='$(top_builddir)/contrib/libmpcdec/libmpcdec.la' fi AC_SUBST(MPCDEC_LIBS) +AC_SUBST(MPCDEC_DEPS) AC_SUBST(MPCDEC_CFLAGS) AM_CONDITIONAL([MUSEPACK], [test "x$enable_musepack" != "xno"]) 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) |