Commit 6b73fd18 authored by mru's avatar mru

Make examples and test progs depend on libraries

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18297 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9485b13f
...@@ -247,5 +247,3 @@ EXAMPLES = output ...@@ -247,5 +247,3 @@ EXAMPLES = output
TESTPROGS = timefilter TESTPROGS = timefilter
include $(SUBDIR)../subdir.mak include $(SUBDIR)../subdir.mak
$(SUBDIR)output-example$(EXESUF) $(SUBDIR)timefilter-test$(EXESUF): $(FF_DEP_LIBS)
...@@ -18,6 +18,8 @@ endif ...@@ -18,6 +18,8 @@ endif
INCINSTDIR := $(INCDIR)/lib$(NAME) INCINSTDIR := $(INCDIR)/lib$(NAME)
THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
define RULES define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
$(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS)
...@@ -96,5 +98,7 @@ endef ...@@ -96,5 +98,7 @@ endef
$(eval $(RULES)) $(eval $(RULES))
$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)
examples: $(EXAMPLES) examples: $(EXAMPLES)
testprogs: $(TESTPROGS) testprogs: $(TESTPROGS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment