diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-01-22 09:55:08 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-01-22 09:55:08 +0000 |
| commit | 4b8b2edb6260d0f0b9e5f2f10a28c3ab19143f2f (patch) | |
| tree | ad99aa1d6345f36734a48949742200a36281bae5 | |
| parent | 811e6d731fadd56c5176ca17916b82379fb5eb93 (diff) | |
| download | ffmpeg-4b8b2edb6260d0f0b9e5f2f10a28c3ab19143f2f.tar.gz | |
dependency handling is consistant with libavcodec
Originally committed as revision 1492 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | vhook/Makefile | 2 |
2 files changed, 6 insertions, 11 deletions
@@ -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 a3566821e5..0f49299e3c 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 |