X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2FMakefile;h=126ebfbbcb1edd5f29a05d1cdf66a4944731a1a3;hb=7b64f5e7f00e445a5637e9e3289a1332a14d28e5;hp=c83a5af2e97b85d6189cadb09d848af2b042e984;hpb=48743e39650eb1ef988380e9d95f27fd40d3a9ce;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/Makefile b/KernelLand/Kernel/arch/x86/Makefile
index c83a5af2..126ebfbb 100644
--- a/KernelLand/Kernel/arch/x86/Makefile
+++ b/KernelLand/Kernel/arch/x86/Makefile
@@ -5,10 +5,11 @@
 
 AS_SUFFIX = asm
 
-CPPFLAGS	=
+CPPFLAGS	= 
 CFLAGS		=
 ASFLAGS		= -f elf
 
+USE_ACPICA ?= 1
 USE_MP=0
 
 ifeq ($(PLATFORM),default)
@@ -18,9 +19,18 @@ else ifeq ($(PLATFORM),smp)
 endif
 
 ASFLAGS += -D USE_MP=$(USE_MP)
-CPPFLAGS += -DUSE_MP=$(USE_MP)
+CPPFLAGS += -DUSE_MP=$(USE_MP) -DUSE_ACPICA=$(USE_ACPICA)
 
-A_OBJ  = start.ao main.o lib.o desctab.ao errors.o irq.o
+A_OBJ  = start.ao main.o mboot.o lib.o desctab.ao errors.o irq.o
 A_OBJ += mm_phys.o mm_virt.o
 A_OBJ += proc.o proc.ao time.o vm8086.o
-A_OBJ += kpanic.o pci.o
+ifeq ($(USE_MP),1)
+A_OBJ += mptable.o
+endif
+A_OBJ += kpanic.o pci.o vpci.o
+
+ifeq ($(USE_ACPICA),1)
+A_OBJ += acpica.o
+EXTERNS += ACPICA
+endif
+