Mercurial > mplayer.hg

changeset 29671:3f5e7b22b2a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC
author diego
date Thu, 24 Sep 2009 09:47:36 +0000
parents 2e3751815a21
children bc094de7968e
files configure subdir.mak
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Wed Sep 23 21:48:48 2009 +0000
+++ b/configure	Thu Sep 24 09:47:36 2009 +0000
@@ -8435,7 +8435,7 @@
 LIBSWSCALE_A = $_libswscale_a
 LIBSWSCALE_SO = $_libswscale_so
 
-BUILD_STATIC=yes
+CONFIG_STATIC=yes
 SRC_PATH=..
 BUILD_ROOT=..
 LIBPREF=lib
--- a/subdir.mak	Wed Sep 23 21:48:48 2009 +0000
+++ b/subdir.mak	Thu Sep 24 09:47:36 2009 +0000
@@ -5,7 +5,7 @@
 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 @@
 
 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 @@
 	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