# HG changeset patch
# User arpi_esp
# Date 991688447 0
# Node ID 74d55f3c4680b0951d52de8c8a3f184555a29421
# Parent  f736cf67a5ab0cf2fab0a8f8400cce2a7da51305
libao->libao2 because of conflict with OMS's libao

diff -r f736cf67a5ab -r 74d55f3c4680 Makefile
--- a/Makefile	Mon Jun 04 20:12:41 2001 +0000
+++ b/Makefile	Mon Jun 04 21:00:47 2001 +0000
@@ -31,7 +31,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMONLIBS = libvo/libvo.a libao2/libao.a libac3/libac3.a mp3lib/libMP3.a
+COMMONLIBS = libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a
 
 loader/libloader.a:
 	$(MAKE) -C loader
@@ -45,7 +45,7 @@
 libvo/libvo.a:
 	$(MAKE) -C libvo
 
-libao2/libao.a:
+libao2/libao2.a:
 	$(MAKE) -C libao2
 
 libac3/libac3.a:
@@ -64,7 +64,7 @@
 	@for a in mp3lib libac3 libmpeg2 libvo opendivx encore loader/DirectShow ; do $(MAKE) -C $$a all ; done
 
 $(PRG):	version.h mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
-	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader $(DS_LIB) -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Llibao2 -lao $(CSS_LIB) -Lencore -lencore $(ARCH_LIBS)
+	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader $(DS_LIB) -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore -Llibao2 -lao2 $(VO_LIBS) $(CSS_LIB) -Lencore -lencore $(ARCH_LIBS)
 
 # $(PRG_HQ):	depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
 # 	$(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread
diff -r f736cf67a5ab -r 74d55f3c4680 libao2/Makefile
--- a/libao2/Makefile	Mon Jun 04 20:12:41 2001 +0000
+++ b/libao2/Makefile	Mon Jun 04 21:00:47 2001 +0000
@@ -1,7 +1,7 @@
 
 include config.mak
 
-LIBNAME = libao.a
+LIBNAME = libao2.a
 
 # TODO: moveout ao_sdl.c so it's only used when SDL is detected
 SRCS=audio_out.c ao_oss.c ao_null.c $(OPTIONAL_SRCS)