ia64/xen-unstable
changeset 9595:68ef2efa929b
Clean up build system some more. No need to explicitly
include Rules.mk/Post.mk all over the place.
Signed-off-by: Keir Fraser <keir@xensource.com>
include Rules.mk/Post.mk all over the place.
Signed-off-by: Keir Fraser <keir@xensource.com>
line diff
1.1 --- a/xen/Makefile Wed Apr 05 15:46:01 2006 +0100 1.2 +++ b/xen/Makefile Wed Apr 05 17:15:34 2006 +0100 1.3 @@ -1,27 +1,20 @@ 1.4 -INSTALL = install 1.5 -INSTALL_DATA = $(INSTALL) -m0644 1.6 -INSTALL_DIR = $(INSTALL) -d -m0755 1.7 - 1.8 # This is the correct place to edit the build version. 1.9 # All other places this is stored (eg. compile.h) should be autogenerated. 1.10 -export XEN_VERSION = 3 1.11 -export XEN_SUBVERSION = 0 1.12 -export XEN_EXTRAVERSION = -unstable 1.13 -export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1.14 +export XEN_VERSION := 3 1.15 +export XEN_SUBVERSION := 0 1.16 +export XEN_EXTRAVERSION := -unstable 1.17 +export XEN_FULLVERSION := $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1.18 1.19 -export BASEDIR := $(CURDIR) 1.20 - 1.21 -include Rules.mk 1.22 +export BASEDIR := $(CURDIR) 1.23 1.24 default: build 1.25 -$(TARGET).gz: $(TARGET) 1.26 - gzip -f -9 < $< > $@.new 1.27 - mv $@.new $@ 1.28 1.29 -debug: 1.30 - objdump -D -S $(TARGET)-syms > $(TARGET).s 1.31 +ifeq ($(XEN_ROOT),) 1.32 1.33 -dist: install 1.34 +build install clean: 1.35 + make -f Rules.mk $@ 1.36 + 1.37 +else 1.38 1.39 build: $(TARGET).gz 1.40 1.41 @@ -38,24 +31,35 @@ install: $(TARGET).gz 1.42 $(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io 1.43 $(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen 1.44 1.45 -clean: delete-unfresh-files 1.46 +clean:: delete-unfresh-files 1.47 $(MAKE) -C tools clean 1.48 - $(MAKE) -C common clean 1.49 - $(MAKE) -C drivers clean 1.50 - $(MAKE) -C acm clean 1.51 - $(MAKE) -C arch/$(TARGET_ARCH) clean 1.52 + $(MAKE) -f $(BASEDIR)/Rules.mk -C common clean 1.53 + $(MAKE) -f $(BASEDIR)/Rules.mk -C drivers clean 1.54 + $(MAKE) -f $(BASEDIR)/Rules.mk -C acm clean 1.55 + $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean 1.56 rm -f include/asm *.o $(TARGET)* *~ core 1.57 rm -f include/asm-*/asm-offsets.h 1.58 rm -f include/xen/acm_policy.h 1.59 1.60 +endif 1.61 + 1.62 +dist: install 1.63 + 1.64 +debug: FORCE 1.65 + objdump -D -S $(TARGET)-syms > $(TARGET).s 1.66 + 1.67 +$(TARGET).gz: $(TARGET) 1.68 + gzip -f -9 < $< > $@.new 1.69 + mv $@.new $@ 1.70 + 1.71 $(TARGET): delete-unfresh-files 1.72 $(MAKE) -C tools 1.73 - $(MAKE) include/xen/compile.h 1.74 - $(MAKE) include/xen/acm_policy.h 1.75 + $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h 1.76 + $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/acm_policy.h 1.77 [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm 1.78 - $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s 1.79 - $(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h 1.80 - $(MAKE) -C arch/$(TARGET_ARCH) $(TARGET) 1.81 + $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) asm-offsets.s 1.82 + $(MAKE) -f $(BASEDIR)/Rules.mk include/asm-$(TARGET_ARCH)/asm-offsets.h 1.83 + $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) $(TARGET) 1.84 1.85 # drivers/char/console.o contains static banner/compile info. Blow it away. 1.86 # Don't refresh these files during e.g., 'sudo make install' 1.87 @@ -115,7 +119,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h 1.88 echo ""; \ 1.89 echo "#endif") <$< >$@ 1.90 1.91 -.PHONY: default debug install dist clean delete-unfresh-files TAGS tags 1.92 +.PHONY: default debug build install dist clean delete-unfresh-files TAGS tags 1.93 1.94 SUBDIRS = acm arch/$(TARGET_ARCH) common drivers 1.95 define all_sources
2.1 --- a/xen/Post.mk Wed Apr 05 15:46:01 2006 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,27 +0,0 @@ 2.4 -# Ensure each subdirectory has exactly one trailing slash. 2.5 -subdir-n := $(patsubst %,%/,$(patsubst %/,%,$(subdir-n))) 2.6 -subdir-y := $(patsubst %,%/,$(patsubst %/,%,$(subdir-y))) 2.7 - 2.8 -# Add explicitly declared subdirectories to the object list. 2.9 -obj-y += $(patsubst %,%/built_in.o,$(subdir-y)) 2.10 - 2.11 -# Add implicitly declared subdirectories (in the object list) to the 2.12 -# subdirectory list, and rewrite the object-list entry. 2.13 -subdir-y += $(filter %/,$(obj-y)) 2.14 -obj-y := $(patsubst %/,%/built-in.o,$(obj-y)) 2.15 - 2.16 -subdir-all := $(subdir-y) $(subdir-n) 2.17 - 2.18 -built_in.o: $(obj-y) 2.19 - $(LD) $(LDFLAGS) -r -o $@ $^ 2.20 - 2.21 -.PHONY: FORCE 2.22 -FORCE: 2.23 - 2.24 -%/built_in.o: FORCE 2.25 - $(MAKE) -C $* 2.26 - 2.27 -clean:: $(addprefix _clean_, $(subdir-all)) FORCE 2.28 - rm -f *.o *~ core 2.29 -_clean_%/: FORCE 2.30 - $(MAKE) -C $* clean
3.1 --- a/xen/Rules.mk Wed Apr 05 15:46:01 2006 +0100 3.2 +++ b/xen/Rules.mk Wed Apr 05 17:15:34 2006 +0100 3.3 @@ -33,6 +33,10 @@ HDRS += $(wildcard $(BASEDIR)/include/pu 3.4 HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) 3.5 HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) 3.6 3.7 +INSTALL := install 3.8 +INSTALL_DATA := $(INSTALL) -m0644 3.9 +INSTALL_DIR := $(INSTALL) -d -m0755 3.10 + 3.11 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk 3.12 3.13 # Do not depend on auto-generated header files. 3.14 @@ -63,6 +67,36 @@ ALL_OBJS := $(ALL_OBJS-y) 3.15 CFLAGS := $(strip $(CFLAGS) $(CFLAGS-y)) 3.16 AFLAGS := $(strip $(AFLAGS) $(AFLAGS-y)) 3.17 3.18 +include Makefile 3.19 + 3.20 +# Ensure each subdirectory has exactly one trailing slash. 3.21 +subdir-n := $(patsubst %,%/,$(patsubst %/,%,$(subdir-n))) 3.22 +subdir-y := $(patsubst %,%/,$(patsubst %/,%,$(subdir-y))) 3.23 + 3.24 +# Add explicitly declared subdirectories to the object list. 3.25 +obj-y += $(patsubst %,%/built_in.o,$(subdir-y)) 3.26 + 3.27 +# Add implicitly declared subdirectories (in the object list) to the 3.28 +# subdirectory list, and rewrite the object-list entry. 3.29 +subdir-y += $(filter %/,$(obj-y)) 3.30 +obj-y := $(patsubst %/,%/built-in.o,$(obj-y)) 3.31 + 3.32 +subdir-all := $(subdir-y) $(subdir-n) 3.33 + 3.34 +built_in.o: $(obj-y) 3.35 + $(LD) $(LDFLAGS) -r -o $@ $^ 3.36 + 3.37 +.PHONY: FORCE 3.38 +FORCE: 3.39 + 3.40 +%/built_in.o: FORCE 3.41 + $(MAKE) -f $(BASEDIR)/Rules.mk -C $* built_in.o 3.42 + 3.43 +clean:: $(addprefix _clean_, $(subdir-all)) FORCE 3.44 + rm -f *.o *~ core 3.45 +_clean_%/: FORCE 3.46 + $(MAKE) -f $(BASEDIR)/Rules.mk -C $* clean 3.47 + 3.48 %.o: %.c $(HDRS) Makefile 3.49 $(CC) $(CFLAGS) -c $< -o $@ 3.50
4.1 --- a/xen/acm/Makefile Wed Apr 05 15:46:01 2006 +0100 4.2 +++ b/xen/acm/Makefile Wed Apr 05 17:15:34 2006 +0100 4.3 @@ -1,9 +1,5 @@ 4.4 -include $(BASEDIR)/Rules.mk 4.5 - 4.6 obj-y += acm_core.o 4.7 obj-y += acm_policy.o 4.8 obj-y += acm_simple_type_enforcement_hooks.o 4.9 obj-y += acm_chinesewall_hooks.o 4.10 obj-y += acm_null_hooks.o 4.11 - 4.12 -include $(BASEDIR)/Post.mk
5.1 --- a/xen/arch/ia64/Makefile Wed Apr 05 15:46:01 2006 +0100 5.2 +++ b/xen/arch/ia64/Makefile Wed Apr 05 17:15:34 2006 +0100 5.3 @@ -1,21 +1,17 @@ 5.4 -include $(BASEDIR)/Rules.mk 5.5 - 5.6 subdir-y += xen 5.7 subdir-y += vmx 5.8 subdir-y += linux 5.9 subdir-y += linux-xen 5.10 5.11 -include $(BASEDIR)/Post.mk 5.12 - 5.13 $(TARGET)-syms: linux-xen/head.o $(ALL_OBJS) xen.lds.s 5.14 $(LD) $(LDFLAGS) -T xen.lds.s -N \ 5.15 -Map map.out linux-xen/head.o $(ALL_OBJS) -o $@ 5.16 $(NM) -n $@ | $(BASEDIR)/tools/symbols > $(BASEDIR)/xen-syms.S 5.17 - $(MAKE) $(BASEDIR)/xen-syms.o 5.18 + $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o 5.19 $(LD) $(LDFLAGS) -T xen.lds.s -N \ 5.20 -Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@ 5.21 $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S 5.22 - $(MAKE) $(BASEDIR)/xen-syms.o 5.23 + $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o 5.24 $(LD) $(LDFLAGS) -T xen.lds.s -N \ 5.25 -Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@ 5.26 rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
6.1 --- a/xen/arch/ia64/linux-xen/Makefile Wed Apr 05 15:46:01 2006 +0100 6.2 +++ b/xen/arch/ia64/linux-xen/Makefile Wed Apr 05 17:15:34 2006 +0100 6.3 @@ -1,5 +1,3 @@ 6.4 -include $(BASEDIR)/Rules.mk 6.5 - 6.6 obj-y += efi.o 6.7 obj-y += entry.o 6.8 obj-y += irq_ia64.o 6.9 @@ -15,5 +13,3 @@ obj-y += time.o 6.10 obj-y += tlb.o 6.11 obj-y += unaligned.o 6.12 obj-y += unwind.o 6.13 - 6.14 -include $(BASEDIR)/Post.mk
7.1 --- a/xen/arch/ia64/linux/Makefile Wed Apr 05 15:46:01 2006 +0100 7.2 +++ b/xen/arch/ia64/linux/Makefile Wed Apr 05 17:15:34 2006 +0100 7.3 @@ -1,6 +1,3 @@ 7.4 -include $(BASEDIR)/Rules.mk 7.5 - 7.6 - 7.7 obj-y += bitop.o 7.8 obj-y += clear_page.o 7.9 obj-y += cmdline.o 7.10 @@ -26,8 +23,6 @@ obj-y += __udivdi3.o 7.11 obj-y += __moddi3.o 7.12 obj-y += __umoddi3.o 7.13 7.14 -include $(BASEDIR)/Post.mk 7.15 - 7.16 ## variants of divide/modulo 7.17 ## see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib) 7.18 __divdi3.o: idiv64.S
8.1 --- a/xen/arch/ia64/vmx/Makefile Wed Apr 05 15:46:01 2006 +0100 8.2 +++ b/xen/arch/ia64/vmx/Makefile Wed Apr 05 17:15:34 2006 +0100 8.3 @@ -1,5 +1,3 @@ 8.4 -include $(BASEDIR)/Rules.mk 8.5 - 8.6 obj-y += hvm_vioapic.o 8.7 obj-y += mm.o 8.8 obj-y += mmio.o 8.9 @@ -20,5 +18,3 @@ obj-y += vmx_vcpu.o 8.10 obj-y += vmx_virt.o 8.11 obj-y += vmx_vsa.o 8.12 obj-y += vtlb.o 8.13 - 8.14 -include $(BASEDIR)/Post.mk
9.1 --- a/xen/arch/ia64/xen/Makefile Wed Apr 05 15:46:01 2006 +0100 9.2 +++ b/xen/arch/ia64/xen/Makefile Wed Apr 05 17:15:34 2006 +0100 9.3 @@ -1,5 +1,3 @@ 9.4 -include $(BASEDIR)/Rules.mk 9.5 - 9.6 obj-y += acpi.o 9.7 obj-y += dom0_ops.o 9.8 obj-y += domain.o 9.9 @@ -26,5 +24,3 @@ obj-y += xensetup.o 9.10 obj-y += xentime.o 9.11 9.12 obj-$(crash_debug) += gdbstub.o 9.13 - 9.14 -include $(BASEDIR)/Post.mk
10.1 --- a/xen/arch/x86/Makefile Wed Apr 05 15:46:01 2006 +0100 10.2 +++ b/xen/arch/x86/Makefile Wed Apr 05 17:15:34 2006 +0100 10.3 @@ -1,5 +1,3 @@ 10.4 -include $(BASEDIR)/Rules.mk 10.5 - 10.6 subdir-y += acpi 10.7 subdir-y += cpu 10.8 subdir-y += genapic 10.9 @@ -50,8 +48,6 @@ obj-$(x86_64) += shadow.o shadow_public. 10.10 10.11 obj-$(crash_debug) += gdbstub.o 10.12 10.13 -include $(BASEDIR)/Post.mk 10.14 - 10.15 $(TARGET): $(TARGET)-syms boot/mkelf32 10.16 ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ 10.17 `$(NM) $(TARGET)-syms | sort | tail -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` 10.18 @@ -60,11 +56,11 @@ include $(BASEDIR)/Post.mk 10.19 $(LD) $(LDFLAGS) -T xen.lds -N \ 10.20 boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@ 10.21 $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S 10.22 - $(MAKE) $(BASEDIR)/xen-syms.o 10.23 + $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o 10.24 $(LD) $(LDFLAGS) -T xen.lds -N \ 10.25 boot/$(TARGET_SUBARCH).o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@ 10.26 $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S 10.27 - $(MAKE) $(BASEDIR)/xen-syms.o 10.28 + $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/xen-syms.o 10.29 $(LD) $(LDFLAGS) -T xen.lds -N \ 10.30 boot/$(TARGET_SUBARCH).o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@ 10.31 rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
11.1 --- a/xen/arch/x86/acpi/Makefile Wed Apr 05 15:46:01 2006 +0100 11.2 +++ b/xen/arch/x86/acpi/Makefile Wed Apr 05 17:15:34 2006 +0100 11.3 @@ -1,5 +1,1 @@ 11.4 -include $(BASEDIR)/Rules.mk 11.5 - 11.6 obj-y += boot.o 11.7 - 11.8 -include $(BASEDIR)/Post.mk
12.1 --- a/xen/arch/x86/cpu/Makefile Wed Apr 05 15:46:01 2006 +0100 12.2 +++ b/xen/arch/x86/cpu/Makefile Wed Apr 05 17:15:34 2006 +0100 12.3 @@ -1,5 +1,3 @@ 12.4 -include $(BASEDIR)/Rules.mk 12.5 - 12.6 subdir-y += mcheck 12.7 subdir-y += mtrr 12.8 12.9 @@ -12,5 +10,3 @@ obj-$(x86_32) += centaur.o 12.10 obj-$(x86_32) += cyrix.o 12.11 obj-$(x86_32) += rise.o 12.12 obj-$(x86_32) += transmeta.o 12.13 - 12.14 -include $(BASEDIR)/Post.mk
13.1 --- a/xen/arch/x86/cpu/mcheck/Makefile Wed Apr 05 15:46:01 2006 +0100 13.2 +++ b/xen/arch/x86/cpu/mcheck/Makefile Wed Apr 05 17:15:34 2006 +0100 13.3 @@ -1,5 +1,3 @@ 13.4 -include $(BASEDIR)/Rules.mk 13.5 - 13.6 obj-y += k7.o 13.7 obj-y += mce.o 13.8 obj-y += non-fatal.o 13.9 @@ -7,5 +5,3 @@ obj-y += p4.o 13.10 obj-y += p5.o 13.11 obj-y += p6.o 13.12 obj-y += winchip.o 13.13 - 13.14 -include $(BASEDIR)/Post.mk
14.1 --- a/xen/arch/x86/cpu/mtrr/Makefile Wed Apr 05 15:46:01 2006 +0100 14.2 +++ b/xen/arch/x86/cpu/mtrr/Makefile Wed Apr 05 17:15:34 2006 +0100 14.3 @@ -1,10 +1,6 @@ 14.4 -include $(BASEDIR)/Rules.mk 14.5 - 14.6 obj-y += amd.o 14.7 obj-y += centaur.o 14.8 obj-y += cyrix.o 14.9 obj-y += generic.o 14.10 obj-y += main.o 14.11 obj-y += state.o 14.12 - 14.13 -include $(BASEDIR)/Post.mk
15.1 --- a/xen/arch/x86/genapic/Makefile Wed Apr 05 15:46:01 2006 +0100 15.2 +++ b/xen/arch/x86/genapic/Makefile Wed Apr 05 17:15:34 2006 +0100 15.3 @@ -1,5 +1,3 @@ 15.4 -include $(BASEDIR)/Rules.mk 15.5 - 15.6 obj-y += bigsmp.o 15.7 obj-y += default.o 15.8 obj-y += delivery.o 15.9 @@ -7,5 +5,3 @@ obj-y += es7000.o 15.10 obj-y += es7000plat.o 15.11 obj-y += probe.o 15.12 obj-y += summit.o 15.13 - 15.14 -include $(BASEDIR)/Post.mk
16.1 --- a/xen/arch/x86/hvm/Makefile Wed Apr 05 15:46:01 2006 +0100 16.2 +++ b/xen/arch/x86/hvm/Makefile Wed Apr 05 17:15:34 2006 +0100 16.3 @@ -1,5 +1,3 @@ 16.4 -include $(BASEDIR)/Rules.mk 16.5 - 16.6 subdir-y += svm 16.7 subdir-y += vmx 16.8 16.9 @@ -10,5 +8,3 @@ obj-y += io.o 16.10 obj-y += platform.o 16.11 obj-y += vioapic.o 16.12 obj-y += vlapic.o 16.13 - 16.14 -include $(BASEDIR)/Post.mk
17.1 --- a/xen/arch/x86/hvm/svm/Makefile Wed Apr 05 15:46:01 2006 +0100 17.2 +++ b/xen/arch/x86/hvm/svm/Makefile Wed Apr 05 17:15:34 2006 +0100 17.3 @@ -1,5 +1,3 @@ 17.4 -include $(BASEDIR)/Rules.mk 17.5 - 17.6 subdir-$(x86_32) += x86_32 17.7 subdir-$(x86_64) += x86_64 17.8 17.9 @@ -8,5 +6,3 @@ obj-y += instrlen.o 17.10 obj-y += intr.o 17.11 obj-y += svm.o 17.12 obj-y += vmcb.o 17.13 - 17.14 -include $(BASEDIR)/Post.mk
18.1 --- a/xen/arch/x86/hvm/svm/x86_32/Makefile Wed Apr 05 15:46:01 2006 +0100 18.2 +++ b/xen/arch/x86/hvm/svm/x86_32/Makefile Wed Apr 05 17:15:34 2006 +0100 18.3 @@ -1,5 +1,1 @@ 18.4 -include $(BASEDIR)/Rules.mk 18.5 - 18.6 obj-y += exits.o 18.7 - 18.8 -include $(BASEDIR)/Post.mk
19.1 --- a/xen/arch/x86/hvm/svm/x86_64/Makefile Wed Apr 05 15:46:01 2006 +0100 19.2 +++ b/xen/arch/x86/hvm/svm/x86_64/Makefile Wed Apr 05 17:15:34 2006 +0100 19.3 @@ -1,5 +1,1 @@ 19.4 -include $(BASEDIR)/Rules.mk 19.5 - 19.6 obj-y += exits.o 19.7 - 19.8 -include $(BASEDIR)/Post.mk
20.1 --- a/xen/arch/x86/hvm/vmx/Makefile Wed Apr 05 15:46:01 2006 +0100 20.2 +++ b/xen/arch/x86/hvm/vmx/Makefile Wed Apr 05 17:15:34 2006 +0100 20.3 @@ -1,10 +1,6 @@ 20.4 -include $(BASEDIR)/Rules.mk 20.5 - 20.6 subdir-$(x86_32) += x86_32 20.7 subdir-$(x86_64) += x86_64 20.8 20.9 obj-y += io.o 20.10 obj-y += vmcs.o 20.11 obj-y += vmx.o 20.12 - 20.13 -include $(BASEDIR)/Post.mk
21.1 --- a/xen/arch/x86/hvm/vmx/x86_32/Makefile Wed Apr 05 15:46:01 2006 +0100 21.2 +++ b/xen/arch/x86/hvm/vmx/x86_32/Makefile Wed Apr 05 17:15:34 2006 +0100 21.3 @@ -1,5 +1,1 @@ 21.4 -include $(BASEDIR)/Rules.mk 21.5 - 21.6 obj-y += exits.o 21.7 - 21.8 -include $(BASEDIR)/Post.mk
22.1 --- a/xen/arch/x86/hvm/vmx/x86_64/Makefile Wed Apr 05 15:46:01 2006 +0100 22.2 +++ b/xen/arch/x86/hvm/vmx/x86_64/Makefile Wed Apr 05 17:15:34 2006 +0100 22.3 @@ -1,5 +1,1 @@ 22.4 -include $(BASEDIR)/Rules.mk 22.5 - 22.6 obj-y += exits.o 22.7 - 22.8 -include $(BASEDIR)/Post.mk
23.1 --- a/xen/arch/x86/x86_32/Makefile Wed Apr 05 15:46:01 2006 +0100 23.2 +++ b/xen/arch/x86/x86_32/Makefile Wed Apr 05 17:15:34 2006 +0100 23.3 @@ -1,5 +1,3 @@ 23.4 -include $(BASEDIR)/Rules.mk 23.5 - 23.6 obj-y += domain_page.o 23.7 obj-y += entry.o 23.8 obj-y += mm.o 23.9 @@ -7,5 +5,3 @@ obj-y += seg_fixup.o 23.10 obj-y += traps.o 23.11 23.12 obj-$(supervisor_mode_kernel) += supervisor_mode_kernel.o 23.13 - 23.14 -include $(BASEDIR)/Post.mk
24.1 --- a/xen/arch/x86/x86_64/Makefile Wed Apr 05 15:46:01 2006 +0100 24.2 +++ b/xen/arch/x86/x86_64/Makefile Wed Apr 05 17:15:34 2006 +0100 24.3 @@ -1,7 +1,3 @@ 24.4 -include $(BASEDIR)/Rules.mk 24.5 - 24.6 obj-y += entry.o 24.7 obj-y += mm.o 24.8 obj-y += traps.o 24.9 - 24.10 -include $(BASEDIR)/Post.mk
25.1 --- a/xen/common/Makefile Wed Apr 05 15:46:01 2006 +0100 25.2 +++ b/xen/common/Makefile Wed Apr 05 17:15:34 2006 +0100 25.3 @@ -1,5 +1,3 @@ 25.4 -include $(BASEDIR)/Rules.mk 25.5 - 25.6 obj-y += acm_ops.o 25.7 obj-y += bitmap.o 25.8 obj-y += dom0_ops.o 25.9 @@ -28,7 +26,5 @@ obj-y += xmalloc.o 25.10 obj-$(perfc) += perfc.o 25.11 obj-$(crash_debug) += gdbstub.o 25.12 25.13 -include $(BASEDIR)/Post.mk 25.14 - 25.15 # Object file contains changeset and compiler information. 25.16 kernel.o: $(BASEDIR)/include/xen/compile.h
26.1 --- a/xen/drivers/Makefile Wed Apr 05 15:46:01 2006 +0100 26.2 +++ b/xen/drivers/Makefile Wed Apr 05 17:15:34 2006 +0100 26.3 @@ -1,6 +1,2 @@ 26.4 -include $(BASEDIR)/Rules.mk 26.5 - 26.6 subdir-y += char 26.7 subdir-$(HAS_ACPI) += acpi 26.8 - 26.9 -include $(BASEDIR)/Post.mk
27.1 --- a/xen/drivers/acpi/Makefile Wed Apr 05 15:46:01 2006 +0100 27.2 +++ b/xen/drivers/acpi/Makefile Wed Apr 05 17:15:34 2006 +0100 27.3 @@ -1,5 +1,1 @@ 27.4 -include $(BASEDIR)/Rules.mk 27.5 - 27.6 obj-y += tables.o 27.7 - 27.8 -include $(BASEDIR)/Post.mk
28.1 --- a/xen/drivers/char/Makefile Wed Apr 05 15:46:01 2006 +0100 28.2 +++ b/xen/drivers/char/Makefile Wed Apr 05 17:15:34 2006 +0100 28.3 @@ -1,10 +1,6 @@ 28.4 -include $(BASEDIR)/Rules.mk 28.5 - 28.6 obj-y += console.o 28.7 obj-y += ns16550.o 28.8 obj-y += serial.o 28.9 28.10 -include $(BASEDIR)/Post.mk 28.11 - 28.12 # Object file contains changeset and compiler information. 28.13 console.o: $(BASEDIR)/include/xen/compile.h