diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-24 09:47:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-24 09:47:36 +0000 |
| commit | 76141a5727ee1cf38aad29fb222f70ec2f0494c6 (patch) | |
| tree | 935fa5375c69ce4ffe0d3122a8a630a34097b817 | |
| parent | 4b182ff652ee52647913a065801df12c99989173 (diff) | |
| download | mpv-76141a5727ee1cf38aad29fb222f70ec2f0494c6.tar.bz2 mpv-76141a5727ee1cf38aad29fb222f70ec2f0494c6.tar.xz | |
sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | subdir.mak | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -8435,7 +8435,7 @@ LIBSWSCALE = $_libswscale LIBSWSCALE_A = $_libswscale_a LIBSWSCALE_SO = $_libswscale_so -BUILD_STATIC=yes +CONFIG_STATIC=yes SRC_PATH=.. BUILD_ROOT=.. LIBPREF=lib diff --git a/subdir.mak b/subdir.mak index 7148ce6fcd..20e5d97667 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 |