diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-04-01 00:53:31 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-04-01 00:53:31 +0000 |
| commit | bbba084b4fcc36c0625368afe6e7586e4991de46 (patch) | |
| tree | ddbc38a2055245a9331fd4514772898858ef1d75 | |
| parent | 92c093c1b5bf5593e5bb987499c5947834cd3ddc (diff) | |
| download | ffmpeg-bbba084b4fcc36c0625368afe6e7586e4991de46.tar.gz | |
Make examples and test progs depend on libraries
Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | subdir.mak | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index c82d2dbbe9..00e1ae5715 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 03c852a09e..7343f548e0 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) |