[MPlayer-cvslog] r26507 - in trunk: Makefile libao2 libao2/Makefile

[diego]

Author: diego
Date: Wed Apr 23 11:33:51 2008
New Revision: 26507

Log:
Merge libao2/Makefile into top-level Makefile.


Removed:
   trunk/libao2/Makefile
Modified:
   trunk/Makefile
   trunk/libao2/   (props changed)

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 23 11:33:51 2008
@@ -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)   += dvd
 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
 
 PARTS = dvdread \
         liba52 \
-        libao2 \
         libavcodec \
         libavformat \
         libavutil \
@@ -244,6 +247,7 @@ DIRS =  gui \
         gui/win32 \
         input \
         libaf \
+        libao2 \
         libass \
         libmenu \
         osdep \