[FFmpeg-cvslog] r18297 - in trunk: libavformat/Makefile subdir.mak

[mru]

Author: mru
Date: Wed Apr  1 02:53:31 2009
New Revision: 18297

Log:
Make examples and test progs depend on libraries

Modified:
   trunk/libavformat/Makefile
   trunk/subdir.mak

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Wed Apr  1 02:53:28 2009	(r18296)
+++ trunk/libavformat/Makefile	Wed Apr  1 02:53:31 2009	(r18297)
@@ -247,5 +247,3 @@ EXAMPLES  = output
 TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)output-example$(EXESUF) $(SUBDIR)timefilter-test$(EXESUF): $(FF_DEP_LIBS)

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Wed Apr  1 02:53:28 2009	(r18296)
+++ trunk/subdir.mak	Wed Apr  1 02:53:31 2009	(r18297)
@@ -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)