From 72dc776c7eb0287330b5987085a8d87feb522ade Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Mon, 4 Jun 2001 21:00:47 +0000 Subject: [PATCH] libao->libao2 because of conflict with OMS's libao git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1014 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- libao2/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 36a5f98f3d..7528595eb1 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ all: $(PRG) .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 @@ libmpeg2/libmpeg2.a: libvo/libvo.a: $(MAKE) -C libvo -libao2/libao.a: +libao2/libao2.a: $(MAKE) -C libao2 libac3/libac3.a: @@ -64,7 +64,7 @@ mplayerwithoutlink: version.h mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) lib @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 --git a/libao2/Makefile b/libao2/Makefile index ddf755f04e..267078ff63 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -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)