ia64/xen-unstable

changeset 9342:0d9855e12426

Fix Xen target image dependencies.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Mar 20 18:25:01 2006 +0100 (2006-03-20)
parents a27f22868d68
children 4813462ed4f9
files xen/Makefile xen/arch/x86/Makefile
line diff
     1.1 --- a/xen/Makefile	Mon Mar 20 18:20:44 2006 +0100
     1.2 +++ b/xen/Makefile	Mon Mar 20 18:25:01 2006 +0100
     1.3 @@ -55,12 +55,14 @@ clean: delete-unfresh-files
     1.4  	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
     1.5  	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
     1.6  	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
     1.7 +ifneq ($(TARGET_ARCH),x86)
     1.8  	$(MAKE) -C common
     1.9  	$(MAKE) -C drivers
    1.10  ifeq ($(ACM_SECURITY),y)
    1.11  	$(MAKE) -C acm
    1.12  endif
    1.13  	$(MAKE) -C arch/$(TARGET_ARCH)
    1.14 +endif
    1.15  	$(MAKE) -C arch/$(TARGET_ARCH) $(TARGET)
    1.16  
    1.17  # drivers/char/console.o contains static banner/compile info. Blow it away.
     2.1 --- a/xen/arch/x86/Makefile	Mon Mar 20 18:20:44 2006 +0100
     2.2 +++ b/xen/arch/x86/Makefile	Mon Mar 20 18:25:01 2006 +0100
     2.3 @@ -55,7 +55,7 @@ include $(BASEDIR)/Post.mk
     2.4  	./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \
     2.5  	`$(NM) $(TARGET)-syms | sort | tail -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'`
     2.6  
     2.7 -$(TARGET)-syms: boot/$(TARGET_SUBARCH).o xen.lds
     2.8 +$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds
     2.9  	$(LD) $(LDFLAGS) -T xen.lds -N \
    2.10  	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@
    2.11  	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S