diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:42:42 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:42:42 +0200 |
| commit | b3ca11f07feb08738128f6b7127ccf8eb3f72ede (patch) | |
| tree | 8814edc61d95606dbc5865edd5ad06220b46de89 | |
| parent | 4ccb7911baa761d373e28068b93db13a76a780b8 (diff) | |
| download | ffmpeg-b3ca11f07feb08738128f6b7127ccf8eb3f72ede.tar.gz | |
Revert "build: Add DEP_LIBS dependency directly to the shared library build rule."
This reverts commit 729f953fb5079ca09bbac391b824be454df029d6.
| -rw-r--r-- | subdir.mak | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/subdir.mak b/subdir.mak index f8473da596..8b3807378f 100644 --- a/subdir.mak +++ b/subdir.mak @@ -39,11 +39,15 @@ $(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 $(DEP_LIBS) +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(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)/%)) \ |