Mercurial > mplayer.hg

changeset 26466:d4f4ce3534c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use directory name as library name template.
author diego
date Tue, 22 Apr 2008 21:51:41 +0000
parents 6b804575c306
children d5d8c4974d7a
files Makefile dvdread/Makefile loader/Makefile mp3lib/Makefile tremor/Makefile vidix/Makefile
diffstat 6 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -167,19 +167,19 @@
 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 @@
 
 CFLAGS := $(subst -I..,-I.,$(CFLAGS))
 
-dvdread/libdvdread.a:
+dvdread/dvdread.a:
 	$(MAKE) -C dvdread
 
 liba52/liba52.a:
@@ -298,19 +298,19 @@
 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)
--- a/dvdread/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/dvdread/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libdvdread.a
+LIBNAME_COMMON = dvdread.a
 
 SRCS_COMMON = cmd_print.c \
               dvd_input.c \
--- a/loader/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/loader/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libloader.a
+LIBNAME_COMMON = loader.a
 
 #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 
--- a/mp3lib/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/mp3lib/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -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
--- a/tremor/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/tremor/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_COMMON = libvorbisidec.a
+LIBNAME_COMMON = tremor.a
 
 SRCS_COMMON = bitwise.c \
               block.c \
--- a/vidix/Makefile	Tue Apr 22 21:48:28 2008 +0000
+++ b/vidix/Makefile	Tue Apr 22 21:51:41 2008 +0000
@@ -1,6 +1,6 @@
 include ../config.mak
 
-LIBNAME_MPLAYER = libvidix.a
+LIBNAME_MPLAYER = vidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
                   drivers.c \