summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 11:46:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 11:46:56 +0000
commit835f0aaae6d957300611289c23b95abd6dd05e25 (patch)
tree27917f3fc9eaf0c16d4e6864b9a5e2bdc6d08c31 /Makefile
parentf9857014b5a8ad705c52831789bceb845c7e7822 (diff)
downloadmpv-835f0aaae6d957300611289c23b95abd6dd05e25.tar.bz2
mpv-835f0aaae6d957300611289c23b95abd6dd05e25.tar.xz
Merge liba52/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a636bca0ea..542a5c2f3a 100644
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,15 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.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) += libmpcodecs/ad_liba52.c \
+ liba52/crc.c \
+ liba52/resample.c \
+ liba52/bit_allocate.c \
+ liba52/bitstream.c \
+ liba52/downmix.c \
+ liba52/imdct.c \
+ liba52/parse.c \
+
SRCS_COMMON-$(LIBASS) += libass/ass.c \
libass/ass_bitmap.c \
libass/ass_cache.c \
@@ -574,7 +582,6 @@ COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
COMMON_LIBS-$(WIN32DLL) += loader/loader.a
COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a
-COMMON_LIBS-$(LIBA52) += liba52/liba52.a
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@@ -592,8 +599,7 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
INSTALL_TARGETS-$(GUI) += install-gui
INSTALL_TARGETS += $(INSTALL_TARGETS-yes)
-PARTS = liba52 \
- libavcodec \
+PARTS = libavcodec \
libavformat \
libavutil \
libpostproc \
@@ -612,6 +618,7 @@ DIRS = dvdread \
gui/wm \
gui/win32 \
input \
+ liba52 \
libaf \
libao2 \
libass \
@@ -696,6 +703,8 @@ $(VIDIX_PCI_FILES): vidix/pci.db
vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES)
+liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o))
+
install: install-dirs $(INSTALL_TARGETS)
install-dirs: