Make examples and test progs depend on libraries

Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Måns Rullgård 16 years ago
parent 92c093c1b5
commit bbba084b4f
  1. 2
      libavformat/Makefile
  2. 4
      subdir.mak

@ -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
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
$(eval $(RULES)) $(eval $(RULES))
$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)
examples: $(EXAMPLES) examples: $(EXAMPLES)
testprogs: $(TESTPROGS) testprogs: $(TESTPROGS)

Loading…
Cancel
Save