From 916058bd22ac3e18c3450a4bf1ecb10562deea29 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 22 Apr 2008 21:51:41 +0000
Subject: Use directory name as library name template.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5c2a95e65c..7bf8cc9a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -167,19 +167,19 @@ COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
 COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
 COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
 COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
-COMMON_LIBS-$(WIN32DLL)           += loader/libloader.a
-COMMON_LIBS-$(MP3LIB)             += mp3lib/libmp3.a
+COMMON_LIBS-$(WIN32DLL)           += loader/loader.a
+COMMON_LIBS-$(MP3LIB)             += mp3lib/mp3lib.a
 COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 COMMON_LIBS-$(FAAD_INTERNAL)      += libfaad2/libfaad2.a
-COMMON_LIBS-$(TREMOR_INTERNAL)    += tremor/libvorbisidec.a
-COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/libdvdread.a
+COMMON_LIBS-$(TREMOR_INTERNAL)    += tremor/tremor.a
+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/libvidix.a
+LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
 
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 libmpdemux/libmpmux.a \
@@ -247,7 +247,7 @@ include mpcommon.mak
 
 CFLAGS := $(subst -I..,-I.,$(CFLAGS))
 
-dvdread/libdvdread.a:
+dvdread/dvdread.a:
 	$(MAKE) -C dvdread
 
 liba52/liba52.a:
@@ -298,19 +298,19 @@ libvo/libvo.a:
 libvo/libosd.a:
 	$(MAKE) -C libvo libosd.a
 
-loader/libloader.a:
+loader/loader.a:
 	$(MAKE) -C loader
 
-mp3lib/libmp3.a:
+mp3lib/mp3lib.a:
 	$(MAKE) -C mp3lib
 
 stream/stream.a:
 	$(MAKE) -C stream
 
-tremor/libvorbisidec.a:
+tremor/tremor.a:
 	$(MAKE) -C tremor
 
-vidix/libvidix.a:
+vidix/vidix.a:
 	$(MAKE) -C vidix
 
 mplayer$(EXESUF): $(MPLAYER_DEPS)
-- 
cgit v1.2.3