summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
commit6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch)
treea785da88f8fc1ffd73619d528bfac70a795d2f51 /Makefile
parent18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff)
parent8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff)
downloadmpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2
mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz
Merge svn changes up to r31169
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 1 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index cb45df4f1c..4031e47047 100644
--- a/Makefile
+++ b/Makefile
@@ -108,16 +108,6 @@ 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_LIBA52_INTERNAL += liba52/crc.c \
- liba52/resample.c \
- liba52/bit_allocate.c \
- liba52/bitstream.c \
- liba52/downmix.c \
- liba52/imdct.c \
- liba52/parse.c \
-
-SRCS_COMMON-$(LIBA52_INTERNAL) += $(SRCS_LIBA52_INTERNAL)
-
SRCS_COMMON-$(LIBASS) += ass_mp.c \
libmpcodecs/vf_ass.c \
@@ -705,7 +695,6 @@ INSTALL_TARGETS-$(MPLAYER) += install-mplayer \
DIRS = . \
input \
- liba52 \
libaf \
libao2 \
libass \
@@ -942,8 +931,6 @@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h $(TEST_OBJS)
codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
-liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
-
libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
@@ -953,8 +940,7 @@ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_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
+TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
ifdef ARCH_X86
TESTS += loader/qtx/list loader/qtx/qtxload