mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Move library name generation to configure, simplifies build system a bit more.
Originally committed as revision 4856 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1c7a8c17ff
commit
4bdd05e76f
4
configure
vendored
4
configure
vendored
@ -230,8 +230,10 @@ FFSLDFLAGS=-Wl,-E
|
||||
LDCONFIG="ldconfig"
|
||||
LIBPREF="lib"
|
||||
LIBSUF=".a"
|
||||
LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
|
||||
SLIBPREF="lib"
|
||||
SLIBSUF=".so"
|
||||
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
|
||||
EXESUF=""
|
||||
@ -1356,6 +1358,7 @@ echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
|
||||
echo "BUILDSUF=$BUILDSUF" >> config.mak
|
||||
echo "LIBPREF=$LIBPREF" >> config.mak
|
||||
echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
|
||||
echo "LIB=$LIB" >> config.mak
|
||||
echo "SLIBPREF=$SLIBPREF" >> config.mak
|
||||
echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
|
||||
echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
|
||||
@ -1508,6 +1511,7 @@ if test "$lshared" = "yes" ; then
|
||||
echo "LAVFVERSION=$lavf_version" >> config.mak
|
||||
echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
|
||||
echo "LAVUVERSION=$lavu_version" >> config.mak
|
||||
echo "SLIBNAME=${SLIBNAME}" >> config.mak
|
||||
echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
|
||||
echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
|
||||
fi
|
||||
|
@ -396,13 +396,11 @@ endif
|
||||
SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
|
||||
OBJS := $(OBJS) $(ASM_OBJS)
|
||||
|
||||
LIB= $(LIBPREF)avcodec$(LIBSUF)
|
||||
NAME=avcodec
|
||||
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
LIBVERSION=$(LAVCVERSION)
|
||||
LIBMAJOR=$(LAVCMAJOR)
|
||||
NAME=avcodec
|
||||
SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF)
|
||||
endif
|
||||
TESTS= imgresample-test dct-test motion-test fft-test
|
||||
|
||||
|
@ -3,12 +3,10 @@ include ../../config.mak
|
||||
|
||||
VPATH=$(SRC_PATH)/libavcodec/libpostproc
|
||||
|
||||
LIB = $(LIBPREF)postproc$(LIBSUF)
|
||||
NAME=postproc
|
||||
ifeq ($(SHARED_PP),yes)
|
||||
LIBVERSION=$(SPPVERSION)
|
||||
LIBMAJOR=$(SPPMAJOR)
|
||||
NAME=postproc
|
||||
SLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
|
||||
endif
|
||||
|
||||
OBJS=postprocess.o
|
||||
|
@ -78,12 +78,10 @@ ifeq ($(TARGET_ARCH_SPARC64),yes)
|
||||
CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
|
||||
endif
|
||||
|
||||
LIB= $(LIBPREF)avformat$(LIBSUF)
|
||||
NAME=avformat
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
LIBVERSION=$(LAVFVERSION)
|
||||
LIBMAJOR=$(LAVFMAJOR)
|
||||
NAME=avformat
|
||||
SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
|
||||
AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
|
||||
endif
|
||||
|
||||
|
@ -20,12 +20,10 @@ endif
|
||||
|
||||
SRCS := $(OBJS:.o=.c)
|
||||
|
||||
LIB= $(LIBPREF)avutil$(LIBSUF)
|
||||
NAME=avutil
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
LIBVERSION=$(LAVUVERSION)
|
||||
LIBMAJOR=$(LAVUMAJOR)
|
||||
NAME=avutil
|
||||
SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
|
||||
endif
|
||||
|
||||
all: $(LIB) $(SLIBNAME)
|
||||
|
Loading…
Reference in New Issue
Block a user