dependencies are only build with make depend

Originally committed as revision 1531 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 1f0c886..d177c1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): .depend ffmpeg.o $(DEP_LIBS)
+ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
        $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
               -lavformat -lavcodec $(EXTRALIBS)
 
@@ -102,6 +102,11 @@ installlib:
 dep:   depend
 
 depend: .depend
+       make -C libavcodec depend
+       make -C libavformat depend
+ifeq ($(BUILD_VHOOK),yes)
+       make -C vhook depend
+endif
 
 .depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 368d967..0716093 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -113,14 +113,14 @@ all: $(LIB) $(SLIB)
 
 tests: apiexample cpuid_test $(TESTS)
 
-$(LIB): .depend $(OBJS)
+$(LIB): $(OBJS)
        rm -f $@
        $(AR) rc $@ $(OBJS)
 ifneq ($(CONFIG_OS2),yes)
        $(RANLIB) $@
 endif
 
-$(SLIB): .depend $(OBJS)
+$(SLIB): $(OBJS)
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
 
 dsputil.o: dsputil.c dsputil.h
@@ -142,13 +142,11 @@ alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
        $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
 endif
 
-.depend: $(SRCS)
+depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 dep:   depend
 
-depend: .depend
-
 clean: 
        rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
           armv4l/*.o armv4l/*~ \