summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-23 09:33:51 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-23 09:33:51 +0000
commit2bcda50ffe8e6972c4256c4fc5121a27b8192055 (patch)
tree2ceff036e0eb09bccd8b00a3c2ee29362e9b0936 /Makefile
parente8d9d7db4ed0f9d637ee8ddb8d0bf8849819dc12 (diff)
downloadmpv-2bcda50ffe8e6972c4256c4fc5121a27b8192055.tar.bz2
mpv-2bcda50ffe8e6972c4256c4fc5121a27b8192055.tar.xz
Merge libao2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0f44319cd0..39de8ddcd8 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,11 @@ SRCS_MPLAYER = mplayer.c \
parser-mpcmd.c \
command.c \
input/input.c \
+ libao2/audio_out.c \
+ libao2/ao_mpegpes.c \
+ libao2/ao_null.c \
+ libao2/ao_pcm.c \
+ $(addprefix libao2/,$(AO_SRCS)) \
SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
@@ -191,7 +196,6 @@ COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a
COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
LIBS_MPLAYER = libvo/libvo.a \
- libao2/libao2.a \
LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a
@@ -216,7 +220,6 @@ INSTALL_TARGETS += $(INSTALL_TARGETS-yes)
PARTS = dvdread \
liba52 \
- libao2 \
libavcodec \
libavformat \
libavutil \
@@ -244,6 +247,7 @@ DIRS = gui \
gui/win32 \
input \
libaf \
+ libao2 \
libass \
libmenu \
osdep \