diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:54:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:55:41 +0200 |
| commit | bb35864759197ac17fe0057b0897f14b0fc54788 (patch) | |
| tree | 9ac2a32eb5293d6bcc9dd0fa06c6a660da523532 /library.mak | |
| parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
| parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
| download | ffmpeg-bb35864759197ac17fe0057b0897f14b0fc54788.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/library.mak b/library.mak index d9e81aeb2e..2728340d0c 100644 --- a/library.mak +++ b/library.mak @@ -5,7 +5,6 @@ include $(SRC_PATH)/common.mak LIBVERSION := $(lib$(NAME)_VERSION) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) INCINSTDIR := $(INCDIR)/lib$(NAME) -THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) @@ -34,11 +33,11 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES -$(EXAMPLES) $(TOOLS): LIB = $(FULLNAME:%=$(LD_LIB)) -$(TESTPROGS): LIB = $(SUBDIR)$(LIBNAME) +$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) +$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(LIB) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) @@ -97,8 +96,8 @@ endef $(eval $(RULES)) -$(EXAMPLES) $(TOOLS): $(THIS_LIB) $(DEP_LIBS) -$(TESTPROGS): $(SUBDIR)$(LIBNAME) $(DEP_LIBS) +$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) +$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME) examples: $(EXAMPLES) testprogs: $(TESTPROGS) |