diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
| commit | 4ccb7911baa761d373e28068b93db13a76a780b8 (patch) | |
| tree | 56c38b10ad0eb94e94f1b7a56a4ec6ca115945e4 /subdir.mak | |
| parent | 5fba761f6e3ff1e3d27fdefe257a9bb31d2cc7ea (diff) | |
| parent | d0ce090ec553c88eb8e9c303156017417d4599cc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: silence some annoying armcc warnings
ffplay: Remove unused-but-set channels variable from update_sample_display().
build: Add DEP_LIBS dependency directly to the shared library build rule.
build: Remove multiple inclusion guards from config.mak.
build: Remove redundant config.mak includes from subdirectory Makefiles.
aacenc: Mark psy_3gpp_window() as av_unused.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'subdir.mak')
| -rw-r--r-- | subdir.mak | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/subdir.mak b/subdir.mak index 8b3807378f..f8473da596 100644 --- a/subdir.mak +++ b/subdir.mak @@ -39,15 +39,11 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) $(SLIB_CREATE_DEF_CMD) $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) -ifdef SUBDIR -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) -endif - clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \ |