Prepare v2015.07-rc2

[karo-tx-uboot.git] / Kbuild

diff --git a/Kbuild b/Kbuild
index 979555f54f77343891a302c85f19f159f70f2e40..465b930f625a73e7b939cb93c3a31f97f01e28bb 100644 (file)
--- a/Kbuild
+++ b/Kbuild
@@ -13,8 +13,9 @@ define sed-y
        s:->::; p;}"
 endef
 
-quiet_cmd_offsets = GEN     $@
-define cmd_offsets
+# Use filechk to avoid rebuilds when a header changes, but the resulting file
+# does not
+define filechk_offsets
        (set -e; \
         echo "#ifndef $2"; \
         echo "#define $2"; \
@@ -22,12 +23,11 @@ define cmd_offsets
         echo " * DO NOT MODIFY."; \
         echo " *"; \
         echo " * This file was generated by Kbuild"; \
-        echo " *"; \
         echo " */"; \
         echo ""; \
-        sed -ne $(sed-y) $<; \
+        sed -ne $(sed-y); \
         echo ""; \
-        echo "#endif" ) > $@
+        echo "#endif" )
 endef
 
 #####
@@ -43,9 +43,8 @@ lib/asm-offsets.s: lib/asm-offsets.c FORCE
        $(Q)mkdir -p $(dir $@)
        $(call if_changed_dep,cc_s_c)
 
-$(obj)/$(generic-offsets-file): lib/asm-offsets.s Kbuild
-       $(Q)mkdir -p $(dir $@)
-       $(call cmd,offsets,__GENERIC_ASM_OFFSETS_H__)
+$(obj)/$(generic-offsets-file): lib/asm-offsets.s FORCE
+       $(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__)
 
 #####
 # 2) Generate asm-offsets.h
@@ -66,5 +65,5 @@ arch/$(ARCH)/lib/asm-offsets.s: arch/$(ARCH)/lib/asm-offsets.c FORCE
        $(Q)mkdir -p $(dir $@)
        $(call if_changed_dep,cc_s_c)
 
-$(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s Kbuild
-       $(call cmd,offsets,__ASM_OFFSETS_H__)
+$(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s FORCE
+       $(call filechk,offsets,__ASM_OFFSETS_H__)