Make examples and test progs depend on libraries

Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · bbba084b4f
parent 92c093c1b5
commit bbba084b4f
2 changed files with 4 additions and 2 deletions
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@ -247,5 +247,3 @@ EXAMPLES  = output
 TESTPROGS = timefilter

 include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)output-example$(EXESUF) $(SUBDIR)timefilter-test$(EXESUF): $(FF_DEP_LIBS)
--- a/subdir.mak
+++ b/subdir.mak
@ -18,6 +18,8 @@ endif

 INCINSTDIR := $(INCDIR)/lib$(NAME)

+THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
+
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
 	$(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS)
@ -96,5 +98,7 @@ endef

 $(eval $(RULES))

+$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)
+
 examples: $(EXAMPLES)
 testprogs: $(TESTPROGS)