]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Wed, 23 Apr 2014 15:07:11 +0000 (11:07 -0400)
committerTom Rini <trini@ti.com>
Wed, 23 Apr 2014 15:07:11 +0000 (11:07 -0400)
Makefile

index 6aaf1169c55af172477b7f701437696233bb339d..01918690407736320645b8ef9d91a32ebae60800 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1093,13 +1093,12 @@ depend dep:
        @echo '*** Warning: make $@ is unnecessary now.'
 
 # ---------------------------------------------------------------------------
-define filechk_ubootlds
-       ($(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
-               -D__ASSEMBLY__ -x assembler-with-cpp -P -o - -)
-endef
+quiet_cmd_cpp_lds = LDS     $@
+cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
+               -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $<
 
 u-boot.lds: $(LDSCRIPT) prepare FORCE
-       $(call filechk,ubootlds)
+       $(call if_changed_dep,cpp_lds)
 
 PHONY += nand_spl
 nand_spl: prepare