Skip to content
Snippets Groups Projects
Commit 3cee76e6 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Remove useless conditional.

Originally committed as revision 8139 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 876e4194
No related branches found
No related tags found
No related merge requests found
...@@ -397,10 +397,8 @@ OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \ ...@@ -397,10 +397,8 @@ OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec NAME=avcodec
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION) LIBVERSION=$(LAVCVERSION)
LIBMAJOR=$(LAVCMAJOR) LIBMAJOR=$(LAVCMAJOR)
endif
TESTS= imgresample-test fft-test TESTS= imgresample-test fft-test
ifeq ($(TARGET_ARCH_X86),yes) ifeq ($(TARGET_ARCH_X86),yes)
......
...@@ -171,9 +171,7 @@ endif ...@@ -171,9 +171,7 @@ endif
endif endif
NAME=avformat NAME=avformat
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION) LIBVERSION=$(LAVFVERSION)
LIBMAJOR=$(LAVFMAJOR) LIBMAJOR=$(LAVFMAJOR)
endif
include ../common.mak include ../common.mak
...@@ -24,9 +24,7 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ ...@@ -24,9 +24,7 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
random.h random.h
NAME=avutil NAME=avutil
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVUVERSION) LIBVERSION=$(LAVUVERSION)
LIBMAJOR=$(LAVUMAJOR) LIBMAJOR=$(LAVUMAJOR)
endif
include ../common.mak include ../common.mak
...@@ -7,10 +7,8 @@ incdir=$(prefix)/include/postproc ...@@ -7,10 +7,8 @@ incdir=$(prefix)/include/postproc
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=postproc NAME=postproc
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(SPPVERSION) LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR) LIBMAJOR=$(SPPMAJOR)
endif
STATIC_OBJS=postprocess.o STATIC_OBJS=postprocess.o
SHARED_OBJS=postprocess_pic.o SHARED_OBJS=postprocess_pic.o
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment