From 4b8b2edb6260d0f0b9e5f2f10a28c3ab19143f2f Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Wed, 22 Jan 2003 09:55:08 +0000
Subject: [PATCH] dependency handling is consistant with libavcodec
Originally committed as revision 1492 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
Makefile | 15 +++++----------
vhook/Makefile | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 1c68273f991..1f0c886f728 100644
--- a/Makefile
+++ b/Makefile
@@ -54,17 +54,14 @@ endif
OBJS = ffmpeg.o ffserver.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-DEPS = $(OBJS:.o=.d)
all: lib $(PROG) $(VHOOK)
--include $(DEPS)
-
lib:
$(MAKE) -C libavcodec all
$(MAKE) -C libavformat all
-ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
+ffmpeg_g$(EXE): .depend ffmpeg.o $(DEP_LIBS)
$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
-lavformat -lavcodec $(EXTRALIBS)
@@ -83,10 +80,6 @@ ffplay: ffmpeg$(EXE)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
-%.d: %.c
- @echo $@ \\ > $@
- $(CC) $(CFLAGS) -MM $< >> $@
-
videohook:
$(MAKE) -C vhook all
@@ -108,8 +101,10 @@ installlib:
dep: depend
-depend:
- $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+depend: .depend
+
+.depend: $(SRCS)
+ $(CC) -MM $(CFLAGS) $^ 1>.depend
clean: $(CLEANVHOOK)
$(MAKE) -C libavcodec clean
diff --git a/vhook/Makefile b/vhook/Makefile
index a3566821e5e..0f49299e3ce 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -30,7 +30,7 @@ imlib2.so: imlib2.o
$(CC) -g -o $@ $(SHFLAGS) $<
clean:
- rm -f *.o *.d *.so *~
+ rm -f *.o *.d .depend *.so *~
ifneq ($(wildcard .depend),)
include .depend
--
GitLab