X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fdepends.mk;h=14cdcdf7a7b1a74b586785edb010f09154db1dfe;hp=4c31eb39843de6b6e65763e93162d54bb78c2b87;hb=d1969d761fc2c0d88b2970c9447d36bc67e108a6;hpb=af03fdb6c5d9f94ec372cc9764a17b7d43a8edb0;ds=sidebyside

diff --git a/include/depends.mk b/include/depends.mk
index 4c31eb3984..14cdcdf7a7 100644
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -11,37 +11,38 @@
 #	3: tempfile for file listings
 #	4: find options
 
-DEP_FINDPARAMS := -x "*.svn*" -x ".*" -x "*.svn*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" -x "*/.*.swp"
 
-find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
+find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
 
 define rdep
   .PRECIOUS: $(2)
   .SILENT: $(2)_check
 
   $(2): $(2)_check
+
+ifneq ($(wildcard $(2)),)
+  $(2)_check::
+	$(if $(3), \
+		$(call find_md5,$(1),$(4)) > $(3).1; \
+		{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
+	) \
+	{ \
+		[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
+	    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
+			$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
+			touch -r "$(2)" "$(2)_check"; \
+		} \
+	} || { \
+		$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
+		touch "$(2)_check"; \
+	}
+	$(if $(3), mv $(3).1 $(3))
+else
   $(2)_check::
-	if [ -f "$(2)" ]; then \
-		$(if $(3), \
-			$(call find_md5,$(1),$(4)) > $(3).1; \
-			{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
-		) \
-		{ \
-			[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
-		    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
-				$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
-				touch -r "$(2)" "$(2)_check"; \
-			} \
-		} || { \
-			$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
-			touch "$(2)_check"; \
-		}; \
-		$(if $(3), mv $(3).1 $(3);) \
-	else \
-		$(if $(3), rm -f $(3) $(3).1;) \
-		$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built";) \
-		true; \
-	fi
+	$(if $(3), rm -f $(3) $(3).1)
+	$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built")
+endif
 
 endef