summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 21:51:41 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 21:51:41 +0000
commit916058bd22ac3e18c3450a4bf1ecb10562deea29 (patch)
tree142676ce6b6968afaeb413f38fd34e9430ec1a3a
parent5c1be94ba33caae90e1effa7389215e4eb9ebf08 (diff)
downloadmpv-916058bd22ac3e18c3450a4bf1ecb10562deea29.tar.bz2
mpv-916058bd22ac3e18c3450a4bf1ecb10562deea29.tar.xz
Use directory name as library name template.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile20
-rw-r--r--dvdread/Makefile2
-rw-r--r--loader/Makefile2
-rw-r--r--mp3lib/Makefile2
-rw-r--r--tremor/Makefile2
-rw-r--r--vidix/Makefile2
6 files changed, 15 insertions, 15 deletions
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)
diff --git a/dvdread/Makefile b/dvdread/Makefile
index 282746cb67..c6fa743104 100644
--- a/dvdread/Makefile
+++ b/dvdread/Makefile
@@ -1,6 +1,6 @@
include ../config.mak
-LIBNAME_COMMON = libdvdread.a
+LIBNAME_COMMON = dvdread.a
SRCS_COMMON = cmd_print.c \
dvd_input.c \
diff --git a/loader/Makefile b/loader/Makefile
index 6aa6ac0646..3765c8c6ad 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -1,6 +1,6 @@
include ../config.mak
-LIBNAME_COMMON = libloader.a
+LIBNAME_COMMON = loader.a
#CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 578f3ebda6..307feefe56 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -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
diff --git a/tremor/Makefile b/tremor/Makefile
index 85506e20e5..d748665913 100644
--- a/tremor/Makefile
+++ b/tremor/Makefile
@@ -1,6 +1,6 @@
include ../config.mak
-LIBNAME_COMMON = libvorbisidec.a
+LIBNAME_COMMON = tremor.a
SRCS_COMMON = bitwise.c \
block.c \
diff --git a/vidix/Makefile b/vidix/Makefile
index bd655a990f..6eeb66a444 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -1,6 +1,6 @@
include ../config.mak
-LIBNAME_MPLAYER = libvidix.a
+LIBNAME_MPLAYER = vidix.a
SRCS_MPLAYER = vidixlib.c \
drivers.c \