X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Externals%2FACPICA%2FMakefile;h=950f0abd15b827b7f7f1ea7a74ad46a73c537af3;hb=85362e8a4c919b58cd261345d29f26bae4ad75e2;hp=761b5ec49262e25d774ececb6cb653a044463989;hpb=9c8b7750be573fbe40bdb3dc4c2a9a5390970b39;p=tpg%2Facess2.git

diff --git a/Externals/ACPICA/Makefile b/Externals/ACPICA/Makefile
index 761b5ec4..950f0abd 100644
--- a/Externals/ACPICA/Makefile
+++ b/Externals/ACPICA/Makefile
@@ -2,8 +2,9 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../Makefile.cfg
 
-COMPONENTS = utilities tables
-BIN := ../bin-$(ARCH)/libacpica.a
+ACPI_DEBUG ?= no
+
+BIN := ../Output/$(ARCH)-kernel/libacpica.a
 
 _VERS := $(patsubst acpica-unix-%.tar.gz,%,$(wildcard acpica-unix-*.tar.gz))
 _VERS := $(sort $(_VERS))
@@ -11,9 +12,9 @@ _LATEST := $(lastword $(_VERS))
 
 ifeq ($(ACPICAVER),)
  ifeq ($(_LATEST),)
-  $(warning Unable to find an archive matching acpica-unix-%.tar.gz)
+  $(warning Unable to find an archive matching acpica-unix-%.tar.gz in Externals/ACPICA)
   $(warning Go to https://www.acpica.org/downloads/ to get it)
-  $(error No ACPICA archive found)
+  $(error No ACPICA archive found, disable ACPI with 'USE_ACPICA=0')
  endif
  
  ifneq ($(_LATEST),$(_VERS))
@@ -31,9 +32,12 @@ CPPFLAGS	+= -I $(KERNELDIR)include -I$(KERNELDIR)arch/$(ARCHDIR)/include -D_MODU
 CPPFLAGS        += -I $(ACPICAROOT)source/include -D _ACESS -D __KERNEL__
 CPPFLAGS	+= -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
 CPPFLAGS	+= -D KERNEL_VERSION=$(KERNEL_VERSION) -ffreestanding
+ifneq ($(ACPI_DEBUG),no)
+  CPPFLAGS += -D ACPI_DEBUG_OUTPUT=1 -D ACPI_DISASSEMBLER=1
+endif
 CFLAGS  	+= -Wall -fno-stack-protector -Wstrict-prototypes -std=gnu99 -g
 
-SRCS := $(foreach comp,$(COMPONENTS),$(wildcard $(COMPDIR)$(comp)/*.c))
+SRCS := $(wildcard $(COMPDIR)*/*.c)
 OBJS := $(SRCS:$(COMPDIR)%.c=obj-$(ARCH)/%.o)
 
 ACENV_H := $(ACPICAROOT)source/include/platform/acenv.h
@@ -46,10 +50,11 @@ extract: $(ACPICAROOT)
 	@echo Re-run make to compile
 endif
 
-all: $(BIN)
+all: $(BIN) include
 
 clean:
-	$(RM) -r obj-$(ARCH)/
+	$(RM) -r obj-$(ARCH)/ include
+
 purge: clean
 	$(RM) -r $(ACPICAROOT)
 
@@ -58,6 +63,9 @@ $(BIN): $(OBJS)
 	@echo [AR] $@
 	@ar rcu $@ $(OBJS)
 
+include:
+	ln -s $(ACPICAROOT)source/include
+
 $(ACPICAROOT): $(ACPICA_ARCHIVE)
 	tar -xf $(ACPICA_ARCHIVE)