From bea81a52c9fd946ecf37a5d982d94be01d7b12e3 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Tue, 28 Jul 2009 08:58:48 +0000 Subject: Replace BUILD_{SHARED,STATIC} with CONFIG_ counterparts Originally committed as revision 19527 to svn://svn.ffmpeg.org/ffmpeg/trunk --- subdir.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'subdir.mak') diff --git a/subdir.mak b/subdir.mak index 4824bc646e..ada6e53763 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 -- cgit v1.2.3