From adcb2190814abe0ea75fb42ae975971d908eb0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 22 Jul 2009 22:30:20 +0000 Subject: [PATCH] Move output redirection of deps generation from make rule to DEPEND_CMD Originally committed as revision 19493 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 6 +++--- configure | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.mak b/common.mak index 9cc735786f..5d5d3137a8 100644 --- a/common.mak +++ b/common.mak @@ -30,13 +30,13 @@ CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS) $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< %.d: %.c - $(DEPEND_CMD) > $@ + $(DEPEND_CMD) %.d: %.S - $(DEPEND_CMD) > $@ + $(DEPEND_CMD) %.d: %.cpp - $(DEPEND_CMD) > $@ + $(DEPEND_CMD) %.o: %.d diff --git a/configure b/configure index 5219687073..c31588ae06 100755 --- a/configure +++ b/configure @@ -1296,7 +1296,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," > $@' DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -MM' # find source path