Commit 4bdd05e7 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Move library name generation to configure, simplifies build system a bit more.

Originally committed as revision 4856 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1c7a8c17
...@@ -230,8 +230,10 @@ FFSLDFLAGS=-Wl,-E ...@@ -230,8 +230,10 @@ FFSLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
LIBPREF="lib" LIBPREF="lib"
LIBSUF=".a" LIBSUF=".a"
LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
SLIBPREF="lib" SLIBPREF="lib"
SLIBSUF=".so" SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
EXESUF="" EXESUF=""
...@@ -1356,6 +1358,7 @@ echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak ...@@ -1356,6 +1358,7 @@ echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak
echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
echo "LIB=$LIB" >> config.mak
echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak
echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
...@@ -1508,6 +1511,7 @@ if test "$lshared" = "yes" ; then ...@@ -1508,6 +1511,7 @@ if test "$lshared" = "yes" ; then
echo "LAVFVERSION=$lavf_version" >> config.mak echo "LAVFVERSION=$lavf_version" >> config.mak
echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
echo "LAVUVERSION=$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_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
fi fi
......
...@@ -396,13 +396,11 @@ endif ...@@ -396,13 +396,11 @@ endif
SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
OBJS := $(OBJS) $(ASM_OBJS) OBJS := $(OBJS) $(ASM_OBJS)
LIB= $(LIBPREF)avcodec$(LIBSUF) NAME=avcodec
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION) LIBVERSION=$(LAVCVERSION)
LIBMAJOR=$(LAVCMAJOR) LIBMAJOR=$(LAVCMAJOR)
NAME=avcodec
SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF)
endif endif
TESTS= imgresample-test dct-test motion-test fft-test TESTS= imgresample-test dct-test motion-test fft-test
......
...@@ -3,12 +3,10 @@ include ../../config.mak ...@@ -3,12 +3,10 @@ include ../../config.mak
VPATH=$(SRC_PATH)/libavcodec/libpostproc VPATH=$(SRC_PATH)/libavcodec/libpostproc
LIB = $(LIBPREF)postproc$(LIBSUF) NAME=postproc
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
LIBVERSION=$(SPPVERSION) LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR) LIBMAJOR=$(SPPMAJOR)
NAME=postproc
SLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
endif endif
OBJS=postprocess.o OBJS=postprocess.o
......
...@@ -78,12 +78,10 @@ ifeq ($(TARGET_ARCH_SPARC64),yes) ...@@ -78,12 +78,10 @@ ifeq ($(TARGET_ARCH_SPARC64),yes)
CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
endif endif
LIB= $(LIBPREF)avformat$(LIBSUF) NAME=avformat
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION) LIBVERSION=$(LAVFVERSION)
LIBMAJOR=$(LAVFMAJOR) LIBMAJOR=$(LAVFMAJOR)
NAME=avformat
SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
endif endif
......
...@@ -20,12 +20,10 @@ endif ...@@ -20,12 +20,10 @@ endif
SRCS := $(OBJS:.o=.c) SRCS := $(OBJS:.o=.c)
LIB= $(LIBPREF)avutil$(LIBSUF) NAME=avutil
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVUVERSION) LIBVERSION=$(LAVUVERSION)
LIBMAJOR=$(LAVUMAJOR) LIBMAJOR=$(LAVUMAJOR)
NAME=avutil
SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
endif endif
all: $(LIB) $(SLIBNAME) all: $(LIB) $(SLIBNAME)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment