ia64/xen-unstable

changeset 11755:56fe7bbcbeaf

Make sure that if one of the intermediate steps fails, a subsequent
make invocation doesn't think there's nothing to do.
This should be viewed as an intermediate step towards splitting up
the rule into three independent ones, passing intermediate files
from one to the next.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Oct 05 16:35:56 2006 +0100 (2006-10-05)
parents efb8b20004b7
children eee52c100996
files xen/arch/x86/Makefile
line diff
     1.1 --- a/xen/arch/x86/Makefile	Thu Oct 05 16:17:06 2006 +0100
     1.2 +++ b/xen/arch/x86/Makefile	Thu Oct 05 16:35:56 2006 +0100
     1.3 @@ -53,18 +53,18 @@ obj-$(crash_debug) += gdbstub.o
     1.4  	$(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/common/symbols-dummy.o
     1.5  	$(LD) $(LDFLAGS) -T xen.lds -N \
     1.6  	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
     1.7 -	    $(BASEDIR)/common/symbols-dummy.o -o $@
     1.8 -	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
     1.9 -	$(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o
    1.10 +	    $(BASEDIR)/common/symbols-dummy.o -o $(@D)/.$(@F).0
    1.11 +	$(NM) -n $(@D)/.$(@F).0 | $(BASEDIR)/tools/symbols >$(@D)/.$(@F).0.S
    1.12 +	$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o
    1.13  	$(LD) $(LDFLAGS) -T xen.lds -N \
    1.14  	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
    1.15 -	    $(BASEDIR)/xen-syms.o -o $@
    1.16 -	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
    1.17 -	$(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o
    1.18 +	    $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1
    1.19 +	$(NM) -n $(@D)/.$(@F).1 | $(BASEDIR)/tools/symbols >$(@D)/.$(@F).1.S
    1.20 +	$(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o
    1.21  	$(LD) $(LDFLAGS) -T xen.lds -N \
    1.22  	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) \
    1.23 -	    $(BASEDIR)/xen-syms.o -o $@
    1.24 -	rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
    1.25 +	    $(@D)/.$(@F).1.o -o $@
    1.26 +	rm -f $(@D)/.$(@F).[0-9]*
    1.27  
    1.28  asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(HDRS)
    1.29  	$(CC) $(CFLAGS) -S -o $@ $<
    1.30 @@ -78,3 +78,4 @@ boot/mkelf32: boot/mkelf32.c
    1.31  .PHONY: clean
    1.32  clean::
    1.33  	rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32
    1.34 +	rm -f $(BASEDIR)/.xen-syms.[0-9]*