summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
commit8e593f5a34b4827d6ec97dd875c802267a6f03b7 (patch)
tree648fde930e4a2b836a9803b17944c370a9608c72 /Makefile
parentbf31241e932818df3bc2eba55cf06c2b9ee3f56f (diff)
parent5c10618fa191d306e6d6674dd2fc7ad46476f85d (diff)
downloadmpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.bz2
mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.xz
Merge svn changes up to r30529
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index eef6f927d6..3766a14e76 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
-SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \
+SRCS_LIBA52_INTERNAL += liba52/crc.c \
liba52/resample.c \
liba52/bit_allocate.c \
liba52/bitstream.c \
@@ -115,6 +115,8 @@ SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \
liba52/imdct.c \
liba52/parse.c \
+SRCS_COMMON-$(LIBA52_INTERNAL) += $(SRCS_LIBA52_INTERNAL)
+
SRCS_COMMON-$(LIBASS) += ass_mp.c \
libmpcodecs/vf_ass.c \
@@ -196,8 +198,10 @@ SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c \
+SRCS_MP3LIB += mp3lib/sr1.c \
$(SRCS_MP3LIB-yes)
+SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \
+ $(SRCS_MP3LIB)
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
libmpdemux/demux_mpc.c
@@ -908,7 +912,7 @@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
-liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm
+liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
@@ -917,7 +921,7 @@ LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o
loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS)
+mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
TESTS = codecs2html codec-cfg-test liba52/test libvo/aspecttest \
mp3lib/test mp3lib/test2