Browse Source

Move output redirection of deps generation from make rule to DEPEND_CMD

Originally committed as revision 19493 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Måns Rullgård 16 years ago
parent
commit
adcb219081
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      common.mak
  2. +1
    -1
      configure

+ 3
- 3
common.mak View File

@@ -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



+ 1
- 1
configure View File

@@ -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


Loading…
Cancel
Save