diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2013-09-08 11:11:52 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2013-09-08 11:11:52 +0200 |
| commit | e25b45bcddaaf55ce0ed4af12693c5a405b938f3 (patch) | |
| tree | 6b023bfafcb2a53522e36828a0e6110ca2bc9002 | |
| parent | 5b37c14f5a2071ff4d36310d83d8c62b157b4e74 (diff) | |
| download | wolfbones-e25b45bcddaaf55ce0ed4af12693c5a405b938f3.tar.gz wolfbones-e25b45bcddaaf55ce0ed4af12693c5a405b938f3.tar.bz2 | |
backported correct multi-line dependency in $(wildcard)
| -rw-r--r-- | makefiles/gmake/depend.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/makefiles/gmake/depend.mk b/makefiles/gmake/depend.mk index 500ad91..cc539eb 100644 --- a/makefiles/gmake/depend.mk +++ b/makefiles/gmake/depend.mk @@ -17,7 +17,9 @@ ifeq "$(COMPILER)" "gcc" %.d : %.c @echo Generating dependencies for $< @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(ALL_CFLAGS) $< | \ - sed "s,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g" | tr -s '&' "\n" > $@ + ( tr -d "\n"; echo "" ) | tr -d '\\' | \ + sed 's,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g' | \ + tr -s '&' "\n" > $@ endif @@ -34,7 +36,9 @@ ifeq "$(COMPILER)" "icc" %.d : %.c @echo Generating dependencies for $< @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(ALL_CFLAGS) $< | \ - sed "s,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g" | tr -s '&' "\n" > $@ + ( tr -d "\n"; echo "" ) | tr -d '\\' | \ + sed 's,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g' | \ + tr -s '&' "\n" > $@ endif @@ -55,6 +59,17 @@ ifeq "$(COMPILER)" "pcc" endif +ifeq "$(COMPILER)" "clang" + +%.d : %.c + @echo Generating dependencies for $< + @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(ALL_CFLAGS) $< | \ + ( tr -d "\n"; echo "" ) | tr -d '\\' | \ + sed 's,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g' | \ + tr -s '&' "\n" > $@ + +endif + ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),distclean) -include $(OBJS:.o=.d) |