# HG changeset patch
# User diego
# Date 1208943231 0
# Node ID 4fe4c27637e09e6a608a7cc8f2c4504c72f72611
# Parent  5ac02417f47496b3db900a977522e2c2b1ae2449
Merge libao2/Makefile into top-level Makefile.

diff -r 5ac02417f474 -r 4fe4c27637e0 Makefile
--- a/Makefile	Wed Apr 23 09:24:54 2008 +0000
+++ b/Makefile	Wed Apr 23 09:33:51 2008 +0000
@@ -111,6 +111,11 @@
                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-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
 
 LIBS_MPLAYER = libvo/libvo.a \
-               libao2/libao2.a \
 
 LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
 
@@ -216,7 +220,6 @@
 
 PARTS = dvdread \
         liba52 \
-        libao2 \
         libavcodec \
         libavformat \
         libavutil \
@@ -244,6 +247,7 @@
         gui/win32 \
         input \
         libaf \
+        libao2 \
         libass \
         libmenu \
         osdep \
diff -r 5ac02417f474 -r 4fe4c27637e0 libao2/Makefile
--- a/libao2/Makefile	Wed Apr 23 09:24:54 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-include ../config.mak
-
-LIBNAME_MPLAYER = libao2.a
-
-SRCS_MPLAYER = audio_out.c \
-               ao_mpegpes.c \
-               ao_null.c \
-               ao_pcm.c \
-               $(AO_SRCS) \
-
-include ../mpcommon.mak