diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
| commit | 2839776b4fe1c282f3f2938d52408a51ca6def96 (patch) | |
| tree | c3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/libmusepack | |
| parent | a800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff) | |
| parent | 6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff) | |
| download | xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2 | |
Merge changes from main repository.
Diffstat (limited to 'src/libmusepack')
| -rw-r--r-- | src/libmusepack/Makefile.am | 9 | ||||
| -rw-r--r-- | src/libmusepack/xine_musepack_decoder.c (renamed from src/libmusepack/xine_decoder.c) | 0 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am index 021ec0985..d39426597 100644 --- a/src/libmusepack/Makefile.am +++ b/src/libmusepack/Makefile.am @@ -4,10 +4,8 @@ SUBDIRS = musepack EXTRA_DIST = diff_against_svn.patch -libdir = $(XINE_PLUGINDIR) - if MUSEPACK -lib_LTLIBRARIES = xineplug_decode_mpc.la +xineplug_LTLIBRARIES = xineplug_decode_mpc.la endif if EXTERNAL_MPCDEC @@ -23,7 +21,6 @@ else xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) endif -xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_decoder.c +xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_musepack_decoder.c xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_mpc_la_LDFLAGS = -avoid-version -module - +xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags) diff --git a/src/libmusepack/xine_decoder.c b/src/libmusepack/xine_musepack_decoder.c index 26c2eddf5..26c2eddf5 100644 --- a/src/libmusepack/xine_decoder.c +++ b/src/libmusepack/xine_musepack_decoder.c |