aboutsummaryrefslogtreecommitdiffstats
path: root/subdir.mak
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-07-10 20:26:25 +0100
committerMans Rullgard <mans@mansr.com>2011-07-10 21:13:38 +0100
commit28e1c97916b026c8785f54ec591718379b251bbb (patch)
tree6470dc3b69d61e32eaabde2b979387c5790dd4a5 /subdir.mak
parentb695256eddf2b3608e6f8da4663d31dcf96612af (diff)
downloadffmpeg-28e1c97916b026c8785f54ec591718379b251bbb.tar.gz
build: rework rules for things in the tools dir
Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'subdir.mak')
-rw-r--r--subdir.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/subdir.mak b/subdir.mak
index 3a38dafe63..a88955bdfb 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -34,7 +34,7 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
-$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
+$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
@@ -91,7 +91,7 @@ endef
$(eval $(RULES))
-$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)
+$(EXAMPLES) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
examples: $(EXAMPLES)
testprogs: $(TESTPROGS)