diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-06-25 02:01:12 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-25 13:02:51 +0200 |
| commit | 729f953fb5079ca09bbac391b824be454df029d6 (patch) | |
| tree | e13d17560a6b07cf68714bcbb1c6f2933ad07604 /subdir.mak | |
| parent | 89b5829d0a4d9510efeff65dbeeaed50e0980120 (diff) | |
| download | ffmpeg-729f953fb5079ca09bbac391b824be454df029d6.tar.gz | |
build: Add DEP_LIBS dependency directly to the shared library build rule.
The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.
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 63398608d7..e4d7377fcb 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)/%)) \ |