From bea81a52c9fd946ecf37a5d982d94be01d7b12e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Tue, 28 Jul 2009 08:58:48 +0000
Subject: [PATCH] Replace BUILD_{SHARED,STATIC} with CONFIG_ counterparts
Originally committed as revision 19527 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
Makefile | 2 +-
common.mak | 2 +-
configure | 2 --
subdir.mak | 6 +++---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 514db6624e0..c3c6d59d8dd 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ ifneq ($(PROGS),)
INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(BUILD_DOC) += install-man
endif
-INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
+INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
diff --git a/common.mak b/common.mak
index 5d5d3137a82..b1277e1ba03 100644
--- a/common.mak
+++ b/common.mak
@@ -71,7 +71,7 @@ EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
OBJS := $(addprefix $(SUBDIR),$(OBJS))
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
-DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
+DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
diff --git a/configure b/configure
index 52f9c3e503e..c9c48165b68 100755
--- a/configure
+++ b/configure
@@ -2576,7 +2576,6 @@ echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "YASMFLAGS=$YASMFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "PIC=-fPIC -DPIC" >> config.mak
-echo "BUILD_STATIC=$static" >> config.mak
echo "BUILDSUF=$build_suffix" >> config.mak
echo "FULLNAME=$FULLNAME" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak
@@ -2623,7 +2622,6 @@ get_version LIBAVUTIL libavutil/avutil.h
get_version LIBAVFILTER libavfilter/avfilter.h
if enabled shared; then
- echo "BUILD_SHARED=yes" >> config.mak
echo "LIBTARGET=${LIBTARGET}" >> config.mak
echo "SLIBNAME=${SLIBNAME}" >> config.mak
echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
diff --git a/subdir.mak b/subdir.mak
index 4824bc646e5..ada6e537634 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak
LIBVERSION := $(lib$(NAME)_VERSION)
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
-ifeq ($(BUILD_STATIC),yes)
+ifeq ($(CONFIG_STATIC),yes)
all: $(SUBDIR)$(LIBNAME)
install-libs: install-lib$(NAME)-static
@@ -18,7 +18,7 @@ endif
INCINSTDIR := $(INCDIR)/lib$(NAME)
-THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
+THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
@@ -44,7 +44,7 @@ distclean:: clean
rm -f $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
$(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
-ifdef BUILD_SHARED
+ifdef CONFIG_SHARED
all: $(SUBDIR)$(SLIBNAME)
install-libs: install-lib$(NAME)-shared
--
GitLab