[sr-dev] git:master: make: depends move/rm file fix & optimization

[Andrei Pelinescu-Onciul]

Module: sip-router
Branch: master
Commit: 965e651fbe84d370c05a647e022023cecf2d02bd
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=965e651fbe84d370c05a647e022023cecf2d02bd

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Tue Mar  9 21:57:25 2010 +0100

make: depends move/rm file fix & optimization

- fix for make failing if the depends were made and a *.h is moved
  or deleted
- avoid restarting make when depends change (make the depends at
  the same moment when the .o are generated)

---

 Makefile.rules |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index a3003be..9fbf02b 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -94,11 +94,9 @@ exec_cmd= $(if $($(quiet)_cmd_$(1)),\
 #implicit rules
 %.o:%.c  $(ALLDEP)
 	$(call exec_cmd,CC)
-
-%.d: %.c $(ALLDEP)
-	@set -e; $(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $<\
-	    |  sed 's#\(\($(*D)/\)\{0,1\}$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \
-	    test -s $@ || ( rm -f $@; false )
+	@$(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $< \
+	|  sed	-e 's/#.*//' -e '/:[ 	]*$$/d' -e '/^[ 	]*$$/d' \
+				-e 's#.*:#$@: $$(wildcard #g' -e 's/\([^\\]\)$$/\1)/'> $*.d
 
 # use RPATH and SER_LIBS if needed (make install and the module depends
 # on some ser libs)
@@ -203,9 +201,6 @@ makecfg.lst:
 .PHONY: all
 all: $(NAME) every-module
 
-.PHONY: dep
-dep: $(depends)
-
 .PHONY: static
 static: $(objs)