[SCM] libav/experimental: Remove useless conditional.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:56:57 UTC 2013
The following commit has been merged in the experimental branch:
commit 3cee76e6c9d13e7e3205ba351b9dfde906885c79
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Feb 27 00:18:38 2007 +0000
Remove useless conditional.
Originally committed as revision 8139 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7e41948..41089d3 100644
--- 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 aa609a6..1a9afb8 100644
--- 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 8155d5a..e7658f0 100644
--- 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 a676536..d30b4a1 100644
--- 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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list