From: mru Date: Wed, 1 Apr 2009 00:53:31 +0000 (+0000) Subject: Make examples and test progs depend on libraries X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/6b73fd181894f6f256d1b73ffb06941b5559e4e7 Make examples and test progs depend on libraries git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18297 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- diff --git a/libavformat/Makefile b/libavformat/Makefile index c82d2dbbe..00e1ae571 100644 --- 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) diff --git a/subdir.mak b/subdir.mak index 03c852a09..7343f548e 100644 --- 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)