netifd: fix compile error when both libnl and libnl-tiny are built

[openwrt.git] / include / depends.mk

diff --git a/include/depends.mk b/include/depends.mk
index b74e535..14cdcdf 100644 (file)
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -6,23 +6,43 @@
 #
 # define a dependency on a subtree
 # parameters:
 #
 # define a dependency on a subtree
 # parameters:

-#      1: directory
+#      1: directories/files

 #      2: directory dependency
 #      3: tempfile for file listings
 #      4: find options
 
 #      2: directory dependency
 #      3: tempfile for file listings
 #      4: find options
 

-FINDPARAMS := -type f -not -name ".*" -and -not -path "*.svn*" 
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" -x "*/.*.swp"
+
+find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
+

 define rdep
 define rdep

-  $(foreach file,$(shell find $(1) $(FINDPARAMS) -and -not -path "*:*" $(4)),
-    $(2): $(file)
-    $(file): ;
-  )
+  .PRECIOUS: $(2)
+  .SILENT: $(2)_check

 
 

-  ifneq ($(shell find $(1) $(FINDPARAMS) $(4) 2>/dev/null | md5s),$(shell cat $(3) 2>/dev/null))
-    $(2): $(3)
-  endif
-  
-  $(3): FORCE
-       @find $(1) $(FINDPARAMS) $(4) 2>/dev/null | md5s > $$@
+  $(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 $(3), rm -f $(3) $(3).1)
+       $(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built")
+endif

 
 endef
 
 endef

+