===== xen/Rules.mk 1.35 vs edited =====
--- 1.35/xen/Rules.mk	2005-03-12 18:35:13 -06:00
+++ edited/xen/Rules.mk	2005-03-21 11:13:54 -06:00
@@ -32,10 +32,14 @@
 OBJS    := $(patsubst %.S,%.o,$(S_SRCS))
 OBJS    += $(patsubst %.c,%.o,$(C_SRCS))
 
+include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
+
 # Note that link order matters!
 ALL_OBJS := $(BASEDIR)/common/common.o
 ALL_OBJS += $(BASEDIR)/drivers/char/driver.o
+ifeq ($(HAS_ACPI),y)
 ALL_OBJS += $(BASEDIR)/drivers/acpi/driver.o
+endif
 ALL_OBJS += $(BASEDIR)/drivers/pci/driver.o
 ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 
@@ -43,8 +47,6 @@
 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 
 
 test-gcc-flag = $(shell gcc -v --help 2>&1 | grep -q " $(1) " && echo $(1))
-
-include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)
 CFLAGS += -DNDEBUG
===== xen/arch/ia64/Rules.mk 1.1 vs edited =====
--- 1.1/xen/arch/ia64/Rules.mk	2005-02-14 06:25:22 -06:00
+++ edited/xen/arch/ia64/Rules.mk	2005-03-21 11:25:37 -06:00
@@ -1,5 +1,7 @@
 ########################################
-# x86-specific definitions
+# ia64-specific definitions
+
+HAS_ACPI := y
 
 ifeq ($(COMPILE_ARCH),$(TARGET_ARCH))
 OBJCOPY = objcopy
===== xen/arch/x86/Rules.mk 1.30 vs edited =====
--- 1.30/xen/arch/x86/Rules.mk	2005-02-10 07:17:10 -06:00
+++ edited/xen/arch/x86/Rules.mk	2005-03-21 11:15:27 -06:00
@@ -1,6 +1,8 @@
 ########################################
 # x86-specific definitions
 
+HAS_ACPI := y
+
 CC := gcc
 LD := ld
 
===== xen/drivers/Makefile 1.11 vs edited =====
--- 1.11/xen/drivers/Makefile	2004-06-10 08:21:37 -05:00
+++ edited/xen/drivers/Makefile	2005-03-21 11:24:11 -06:00
@@ -1,10 +1,13 @@
+include $(BASEDIR)/Rules.mk
+
+DIRS := char pci
+
+ifeq ($(HAS_ACPI),y)
+DIRS += acpi
+endif
 
 default:
-	$(MAKE) -C char
-	$(MAKE) -C acpi
-	$(MAKE) -C pci
+	for DIR in $(DIRS) ; do $(MAKE) -C $$DIR ; done
 
 clean:
-	$(MAKE) -C char clean
-	$(MAKE) -C acpi clean
-	$(MAKE) -C pci clean
+	for DIR in $(DIRS) ; do $(MAKE) -C $$DIR clean ; done