[MPlayer-cvslog] r29713 - in trunk: configure subdir.mak

[diego]

Author: diego
Date: Thu Sep 24 11:47:36 2009
New Revision: 29713

Log:
sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC

Modified:
   trunk/configure
   trunk/subdir.mak

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Sep 23 23:48:48 2009	(r29712)
+++ trunk/configure	Thu Sep 24 11:47:36 2009	(r29713)
@@ -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

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Wed Sep 23 23:48:48 2009	(r29712)
+++ trunk/subdir.mak	Thu Sep 24 11:47:36 2009	(r29713)
@@ -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