diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-08-08 18:27:22 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-08-08 18:27:22 +0000 |
| commit | c1c3933a98133bebbcaf1e0a0883ced9d9bcda1c (patch) | |
| tree | b06732b72035f297d4ca07fd61b271dc99a4d356 | |
| parent | 0bf18ed32d608204e6e852c23b61f21118d7cb1a (diff) | |
| download | ffmpeg-c1c3933a98133bebbcaf1e0a0883ced9d9bcda1c.tar.gz | |
Generate dependencies when object files are built
Originally committed as revision 19608 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 15 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/common.mak b/common.mak index b1277e1ba0..4f7abe79dd 100644 --- a/common.mak +++ b/common.mak @@ -21,25 +21,16 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS) %.o: %.c + $(DEPEND_CMD) $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $< %.o: %.S + $(DEPEND_CMD) $(AS) $(CPPFLAGS) $(ASFLAGS) $(LIBOBJFLAGS) -c -o $@ $< %.ho: %.h $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< -%.d: %.c - $(DEPEND_CMD) - -%.d: %.S - $(DEPEND_CMD) - -%.d: %.cpp - $(DEPEND_CMD) - -%.o: %.d - %$(EXESUF): %.c SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries @@ -83,4 +74,4 @@ CLEANSUFFIXES = *.o *~ *.ho *.map DISTCLEANSUFFIXES = *.d *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp --include $(DEPS) +-include $(wildcard $(DEPS)) @@ -1309,7 +1309,7 @@ target_path='.' # gcc stupidly only outputs the basename of targets with -MM, but we need the # full relative path for objects in subdirectories for non-recursive Make. -DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $@' +DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)' DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -MM' # find source path |