]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Fix Makefile dependency problem with parallel builds.
authorWolfgang Denk <wd@denx.de>
Sun, 13 Jan 2008 20:05:52 +0000 (21:05 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Jan 2008 22:36:06 +0000 (23:36 +0100)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile

index eba9333cb49d1fd5a3d95d843486ca2018eabea5..8a888b9232c2db7556b9db347d15344e8c048268 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -309,26 +309,25 @@ $(obj)u-boot.sha1:        $(obj)u-boot.bin
 $(obj)u-boot.dis:      $(obj)u-boot
                $(OBJDUMP) -d $< > $@
 
-$(obj)u-boot:          depend $(obj)include/autoconf.mk \
-                       $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
+$(obj)u-boot:          depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
 
-$(OBJS):
+$(OBJS):       $(obj)include/autoconf.mk
                $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
 
-$(LIBS):
+$(LIBS):       $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $(subst $(obj),,$@))
 
-$(SUBDIRS):
+$(SUBDIRS):    $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
-$(NAND_SPL):   $(VERSION_FILE)
+$(NAND_SPL):   $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
 
-$(U_BOOT_NAND):        $(NAND_SPL) $(obj)u-boot.bin
+$(U_BOOT_NAND):        $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
                cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
 
 $(VERSION_FILE):