From 484b7da8eccd7957112bdacb8c79022671d09bbb Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Fri, 9 May 2014 15:06:15 +0800 Subject: Utilities: Cleanup use of ACPI_DEBUGGER The acpinames code defines ACPI_DEBUGGER in order to link AcpiDbReadTableFromFile(). This patch splits the AcpiDbReadTableFromFile() function from the debugger and implements it in a generic utilities API so that acpinames no longer needs to link the debugger for this. Because acpinames needs access to dump functions, ACPI_DEBUG_OUTPUT needs to be defined and AcpiDbgLevel needs to be set to maintain consistent behavior. This patch also cleans up ACPI_DEBUGGER for acpihelp. This patch is required for removing anstubs.c. Without doing this first, removing anstubs.c will lead to many link requirements to all debugger and disassembler objects for acpinames. Signed-off-by: Lv Zheng --- generate/unix/acpinames/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'generate/unix/acpinames/Makefile') diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile index 00a0026c2..5f5178ff4 100644 --- a/generate/unix/acpinames/Makefile +++ b/generate/unix/acpinames/Makefile @@ -21,7 +21,6 @@ PROG = $(OBJDIR)/acpinames # vpath %.c \ $(ACPINAMES)\ - $(ACPICA_DEBUGGER)\ $(ACPICA_DISPATCHER)\ $(ACPICA_EXECUTER)\ $(ACPICA_NAMESPACE)\ @@ -39,7 +38,6 @@ OBJECTS = \ $(OBJDIR)/anstubs.o\ $(OBJDIR)/antables.o\ $(OBJDIR)/cmfsize.o\ - $(OBJDIR)/dbfileio.o\ $(OBJDIR)/dsfield.o\ $(OBJDIR)/dsmthdat.o\ $(OBJDIR)/dsobject.o\ @@ -49,6 +47,7 @@ OBJECTS = \ $(OBJDIR)/dswscope.o\ $(OBJDIR)/dswstate.o\ $(OBJDIR)/excreate.o\ + $(OBJDIR)/exdump.o\ $(OBJDIR)/exnames.o\ $(OBJDIR)/exresnte.o\ $(OBJDIR)/exresolv.o\ @@ -91,12 +90,14 @@ OBJECTS = \ $(OBJDIR)/tbxfroot.o\ $(OBJDIR)/utaddress.o\ $(OBJDIR)/utalloc.o\ + $(OBJDIR)/utbuffer.o\ $(OBJDIR)/utcache.o\ $(OBJDIR)/utdebug.o\ $(OBJDIR)/utdecode.o\ $(OBJDIR)/utdelete.o\ $(OBJDIR)/uterror.o\ $(OBJDIR)/utexcep.o\ + $(OBJDIR)/utfileio.o\ $(OBJDIR)/utglobal.o\ $(OBJDIR)/utlock.o\ $(OBJDIR)/utmath.o\ -- cgit v1.2.1