Remove useless conditional.

Originally committed as revision 8139 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7e4194817e207e7b2437a9eb73fa2dfe22f057fa..41089d3a7f16b60298e937bacd0e437d6db55f98 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -397,10 +397,8 @@ OBJS-$(TARGET_ARCH_BFIN)               += bfin/dsputil_bfin.o \
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 NAME=avcodec
-ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)
 LIBMAJOR=$(LAVCMAJOR)
-endif
 
 TESTS= imgresample-test fft-test
 ifeq ($(TARGET_ARCH_X86),yes)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index aa609a6d1a1b0a79b81b5544743d45cd58a585e0..1a9afb83e757cbe5f5209452ec5bf425b083ede0 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -171,9 +171,7 @@ endif
 endif
 
 NAME=avformat
-ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)
-endif
 
 include ../common.mak

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 8155d5acb054a1ec9438d0df437dd982213ac7a6..e7658f0916edd18d798eb2a68d6e5df7f9525374 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -24,9 +24,7 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
           random.h
 
 NAME=avutil
-ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
-endif
 
 include ../common.mak

diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index a6765365d83b27cb14ba54c630721d981185fdd4..d30b4a18dea4bf2da142681706380eae76b30325 100644 (file)
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -7,10 +7,8 @@ incdir=$(prefix)/include/postproc
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 NAME=postproc
-ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)
-endif
 
 STATIC_OBJS=postprocess.o
 SHARED_OBJS=postprocess_pic.o