summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-07-22 22:30:20 +0000
committerMåns Rullgård <mans@mansr.com>2009-07-22 22:30:20 +0000
commitadcb2190814abe0ea75fb42ae975971d908eb0a2 (patch)
treee543058b780aa6d6ad5f17eb6bc8f967e97644c2
parent99e5a9d1ea2a61ac9429427431e5b9c2fefb76a5 (diff)
Move output redirection of deps generation from make rule to DEPEND_CMD
Originally committed as revision 19493 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak6
-rwxr-xr-xconfigure2
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