[MPlayer-cvslog] r26498 - in trunk: Makefile dvdread dvdread/Makefile loader loader/Makefile mp3lib mp3lib/Makefile tremor tremor/Makefile vidix vidix/Makefile

[diego]

Author: diego
Date: Tue Apr 22 23:51:41 2008
New Revision: 26498

Log:
Use directory name as library name template.


Modified:
   trunk/Makefile
   trunk/dvdread/   (props changed)
   trunk/dvdread/Makefile
   trunk/loader/   (props changed)
   trunk/loader/Makefile
   trunk/mp3lib/   (props changed)
   trunk/mp3lib/Makefile
   trunk/tremor/   (props changed)
   trunk/tremor/Makefile
   trunk/vidix/   (props changed)
   trunk/vidix/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Apr 22 23:51:41 2008
@@ -167,19 +167,19 @@ COMMON_LIBS-$(LIBAVFORMAT_A)      += lib
 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)

Modified: trunk/dvdread/Makefile
==============================================================================
--- trunk/dvdread/Makefile	(original)
+++ trunk/dvdread/Makefile	Tue Apr 22 23:51:41 2008
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libdvdread.a
+LIBNAME_COMMON = dvdread.a
 
 SRCS_COMMON = cmd_print.c \
               dvd_input.c \

Modified: trunk/loader/Makefile
==============================================================================
--- trunk/loader/Makefile	(original)
+++ trunk/loader/Makefile	Tue Apr 22 23:51:41 2008
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libloader.a
+LIBNAME_COMMON = loader.a
 
 #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 

Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Tue Apr 22 23:51:41 2008
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libmp3.a
+LIBNAME_COMMON = mp3lib.a
 
 SRCS_COMMON = sr1.c
 SRCS_COMMON-$(HAVE_MMX)       += decode_mmx.c

Modified: trunk/tremor/Makefile
==============================================================================
--- trunk/tremor/Makefile	(original)
+++ trunk/tremor/Makefile	Tue Apr 22 23:51:41 2008
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libvorbisidec.a
+LIBNAME_COMMON = tremor.a
 
 SRCS_COMMON = bitwise.c \
               block.c \

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Tue Apr 22 23:51:41 2008
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_MPLAYER = libvidix.a
+LIBNAME_MPLAYER = vidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
                   drivers.c \