Revision bea81a52

View differences:

Makefile
37 37
INSTALL_TARGETS-yes             += install-progs install-data
38 38
INSTALL_TARGETS-$(BUILD_DOC)    += install-man
39 39
endif
40
INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
40
INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
41 41

  
42 42
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
43 43

  
common.mak
71 71
OBJS      := $(addprefix $(SUBDIR),$(OBJS))
72 72
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
73 73

  
74
DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
74
DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
75 75

  
76 76
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
77 77
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
configure
2576 2576
echo "YASMFLAGS=$YASMFLAGS" >> config.mak
2577 2577
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
2578 2578
echo "PIC=-fPIC -DPIC" >> config.mak
2579
echo "BUILD_STATIC=$static" >> config.mak
2580 2579
echo "BUILDSUF=$build_suffix" >> config.mak
2581 2580
echo "FULLNAME=$FULLNAME" >> config.mak
2582 2581
echo "LIBPREF=$LIBPREF" >> config.mak
......
2623 2622
get_version LIBAVFILTER libavfilter/avfilter.h
2624 2623

  
2625 2624
if enabled shared; then
2626
    echo "BUILD_SHARED=yes" >> config.mak
2627 2625
    echo "LIBTARGET=${LIBTARGET}" >> config.mak
2628 2626
    echo "SLIBNAME=${SLIBNAME}" >> config.mak
2629 2627
    echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
subdir.mak
5 5
LIBVERSION := $(lib$(NAME)_VERSION)
6 6
LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
7 7

  
8
ifeq ($(BUILD_STATIC),yes)
8
ifeq ($(CONFIG_STATIC),yes)
9 9
all: $(SUBDIR)$(LIBNAME)
10 10

  
11 11
install-libs: install-lib$(NAME)-static
......
18 18

  
19 19
INCINSTDIR := $(INCDIR)/lib$(NAME)
20 20

  
21
THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
21
THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
22 22

  
23 23
define RULES
24 24
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
......
44 44
	rm -f  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
45 45
            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
46 46

  
47
ifdef BUILD_SHARED
47
ifdef CONFIG_SHARED
48 48
all: $(SUBDIR)$(SLIBNAME)
49 49

  
50 50
install-libs: install-lib$(NAME)-shared

Also available in: Unified diff