From e25b45bcddaaf55ce0ed4af12693c5a405b938f3 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 8 Sep 2013 11:11:52 +0200 Subject: backported correct multi-line dependency in $(wildcard) --- makefiles/gmake/depend.mk | 19 +++++++++++++++++-- 1 file 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) -- cgit v1.2.3-54-g00ecf