Merge pull request #604 from SchmErik/remove-acpinames

Remove support for the acpinames utility

7 files changed, 3 insertions, 1501 deletions

diff --git a/generate/msvc2017/AcpiComponents.sln b/generate/msvc2017/AcpiComponents.sln
index e602cd99e..006726356 100755
--- a/generate/msvc2017/AcpiComponents.sln
+++ b/generate/msvc2017/AcpiComponents.sln
@@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiExec", "AcpiExec.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiHelp", "AcpiHelp.vcxproj", "{8828CA34-62C1-4A1D-AB26-78CB6B1C46D7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiNames", "AcpiNames.vcxproj", "{47CBF223-DC2E-4779-967A-9704AB63180D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiSrc", "AcpiSrc.vcxproj", "{F582C598-249C-4673-AF1F-F1D1884DB0B5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiSubsystem", "AcpiSubsystem.vcxproj", "{768B4FF9-311F-44F1-B0FC-41CC5A9A5053}"
@@ -52,11 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiHelp", "AcpiHelp", "{20
 		..\unix\acpihelp\Makefile = ..\unix\acpihelp\Makefile
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiNames", "AcpiNames", "{9A4B4717-5624-4DFA-A7A5-D0D838D5A56C}"
-	ProjectSection(SolutionItems) = preProject
-		..\unix\acpinames\Makefile = ..\unix\acpinames\Makefile
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiSrc", "AcpiSrc", "{7C545DE1-E27C-4AEF-A008-8976469EDA80}"
 	ProjectSection(SolutionItems) = preProject
 		..\unix\acpisrc\Makefile = ..\unix\acpisrc\Makefile
@@ -108,12 +101,6 @@ Global
 		{8828CA34-62C1-4A1D-AB26-78CB6B1C46D7}.Release|x86.Build.0 = Release|Win32
 		{8828CA34-62C1-4A1D-AB26-78CB6B1C46D7}.Template|x86.ActiveCfg = Template|Win32
 		{8828CA34-62C1-4A1D-AB26-78CB6B1C46D7}.Template|x86.Build.0 = Template|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Debug|x86.ActiveCfg = Debug|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Debug|x86.Build.0 = Debug|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Release|x86.ActiveCfg = Release|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Release|x86.Build.0 = Release|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Template|x86.ActiveCfg = Template|Win32
-		{47CBF223-DC2E-4779-967A-9704AB63180D}.Template|x86.Build.0 = Template|Win32
 		{F582C598-249C-4673-AF1F-F1D1884DB0B5}.Debug|x86.ActiveCfg = Debug|Win32
 		{F582C598-249C-4673-AF1F-F1D1884DB0B5}.Debug|x86.Build.0 = Debug|Win32
 		{F582C598-249C-4673-AF1F-F1D1884DB0B5}.Release|x86.ActiveCfg = Release|Win32
@@ -153,7 +140,6 @@ Global
 		{5BBBEDF7-F887-4D85-8C8B-A892752B71C3} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
 		{D8E8013C-5740-41AD-8053-A04FC2519155} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
 		{203AF658-377B-4088-88DF-DE384C96A95A} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
-		{9A4B4717-5624-4DFA-A7A5-D0D838D5A56C} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
 		{7C545DE1-E27C-4AEF-A008-8976469EDA80} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
 		{98A33210-5764-4F95-89ED-EEE50DF5611C} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
 		{EDB04702-9BFE-4C6D-A471-F921F99593EF} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
diff --git a/generate/msvc2017/AcpiNames.dsp b/generate/msvc2017/AcpiNames.dsp
deleted file mode 100755
index ad2939bf6..000000000
--- a/generate/msvc2017/AcpiNames.dsp
+++ /dev/null
@@ -1,528 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AcpiNames" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AcpiNames - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "AcpiNames.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "AcpiNames.mak" CFG="AcpiNames - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "AcpiNames - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AcpiNames - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "AcpiNames - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "AcpiNames"
-# PROP Intermediate_Dir "AcpiNames"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gi /Ob1 /Gf /I "..\..\source\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "ACPI_NAMES_APP" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=Checking existence of acpica/libraries directory
-PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
-PostBuild_Desc=Copying acpinames to libraries...
-PostBuild_Cmds=copy acpinames\acpinames.exe ..\..\libraries\acpinames.exe
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "AcpiNames - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "AcpiNamesDebug"
-# PROP Intermediate_Dir "AcpiNamesDebug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /Gi /Zi /Od /Ob1 /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "ACPI_NAMES_APP" /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=Checking existence of acpica/libraries directory
-PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
-PostBuild_Desc=Copying acpinames to libraries...
-PostBuild_Cmds=copy acpinamesdebug\acpinames.exe ..\..\libraries\acpinames_dbg.exe
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "AcpiNames - Win32 Release"
-# Name "AcpiNames - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "Common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\common\acfileio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\cmfsize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\os_specific\service_layers\oswinxf.c
-# ADD CPP /Ze
-# End Source File
-# End Group
-# Begin Group "Utilities"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utaddress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utascii.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utcache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utdebug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utdecode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utdelete.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\uterror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\uteval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utexcep.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utglobal.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\uthex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utids.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utlock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utmath.c
-# ADD CPP /Ze
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utmisc.c
-
-!IF  "$(CFG)" == "AcpiNames - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "AcpiNames - Win32 Debug"
-
-# ADD CPP /Za
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utmutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utnonansi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utosi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utownerid.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utstate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utstring.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utstrtoul64.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utuuid.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utxface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utxferror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\utilities\utxfinit.c
-# End Source File
-# End Group
-# Begin Group "Tables"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbdata.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbfadt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbfind.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbinstal.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbprint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbxface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbxfload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\tables\tbxfroot.c
-# End Source File
-# End Group
-# Begin Group "Namespace"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsaccess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsconvert.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsnames.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nssearch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nswalk.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsxfeval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsxfname.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\namespace\nsxfobj.c
-# End Source File
-# End Group
-# Begin Group "Parser"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psargs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psloop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psopcode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psopinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psscope.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\pstree.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\pswalk.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\parser\psxface.c
-# End Source File
-# End Group
-# Begin Group "Debugger"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\debugger\dbfileio.c
-# End Source File
-# End Group
-# Begin Group "Dispatcher"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dsfield.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dsinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dsmthdat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dsobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dsutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dswload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dswload2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dswscope.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\dispatcher\dswstate.c
-# End Source File
-# End Group
-# Begin Group "Executer"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exconvrt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\excreate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exmutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exnames.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exprep.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exresnte.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exresolv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exsystem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\components\executer\exutils.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\source\tools\AcpiNames\anmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\tools\AcpiNames\anstubs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\tools\AcpiNames\antables.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\source\tools\AcpiNames\AcpiNames.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/generate/msvc2017/AcpiNames.vcxproj b/generate/msvc2017/AcpiNames.vcxproj
deleted file mode 100755
index 36f93b1e7..000000000
--- a/generate/msvc2017/AcpiNames.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-    <ProjectGuid>{47CBF223-DC2E-4779-967A-9704AB63180D}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\AcpiNames\</OutDir>
-    <IntDir>.\AcpiNames\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\AcpiNamesDebug\</OutDir>
-    <IntDir>.\AcpiNamesDebug\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level4</WarningLevel>
-      <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>..\..\source\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;__STDC__;ACPI_NAMES_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\AcpiNames\</AssemblerListingLocation>
-      <PrecompiledHeaderOutputFile>.\AcpiNames\AcpiNames.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\AcpiNames\</ObjectFileName>
-      <ProgramDataBaseFileName>.\AcpiNames\</ProgramDataBaseFileName>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <ConformanceMode>true</ConformanceMode>
-      <CallingConvention>FastCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>if NOT EXIST ..\..\libraries mkdir ..\..\libraries</Command>
-      <Message>Checking existence of acpica/libraries directory</Message>
-    </PreLinkEvent>
-    <PostBuildEvent>
-      <Command>copy acpinames\acpinames.exe ..\..\libraries\acpinames.exe</Command>
-      <Message>Copying acpinames to libraries...</Message>
-    </PostBuildEvent>
-    <Midl>
-      <TypeLibraryName>.\AcpiNames\AcpiNames.tlb</TypeLibraryName>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\AcpiNames\AcpiNames.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>.\AcpiNames\AcpiNames.exe</OutputFile>
-      <AdditionalDependencies>kernel32.lib;setargv.obj;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level4</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>..\..\source\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;__STDC__;ACPI_NAMES_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\AcpiNamesDebug\</AssemblerListingLocation>
-      <PrecompiledHeaderOutputFile>.\AcpiNamesDebug\AcpiNames.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\AcpiNamesDebug\</ObjectFileName>
-      <ProgramDataBaseFileName>.\AcpiNamesDebug\</ProgramDataBaseFileName>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <StringPooling>true</StringPooling>
-      <CallingConvention>FastCall</CallingConvention>
-      <CompileAs>CompileAsC</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>if NOT EXIST ..\..\libraries mkdir ..\..\libraries</Command>
-      <Message>Checking existence of acpica/libraries directory</Message>
-    </PreLinkEvent>
-    <PostBuildEvent>
-      <Command>copy acpinamesdebug\acpinames.exe ..\..\libraries\acpinames_dbg.exe</Command>
-      <Message>Copying acpinames to libraries...</Message>
-    </PostBuildEvent>
-    <Midl>
-      <TypeLibraryName>.\AcpiNamesDebug\AcpiNames.tlb</TypeLibraryName>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\AcpiNamesDebug\AcpiNames.bsc</OutputFile>
-      <AdditionalOptions> /o"/acpica/generate/msvc2017/AcpiNamesDebug/AcpiNames.bsc"</AdditionalOptions>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>.\AcpiNamesDebug\AcpiNames.exe</OutputFile>
-      <AdditionalDependencies>kernel32.lib;setargv.obj;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\common\acfileio.c" />
-    <ClCompile Include="..\..\source\common\cmfsize.c" />
-    <ClCompile Include="..\..\source\common\getopt.c" />
-    <ClCompile Include="..\..\source\components\debugger\dbfileio.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dscontrol.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsdebug.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsfield.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsinit.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsmethod.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsmthdat.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsobject.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsopcode.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dspkginit.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dsutils.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dswexec.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dswload.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dswload2.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dswscope.c" />
-    <ClCompile Include="..\..\source\components\dispatcher\dswstate.c" />
-    <ClCompile Include="..\..\source\components\events\evhandler.c" />
-    <ClCompile Include="..\..\source\components\events\evmisc.c" />
-    <ClCompile Include="..\..\source\components\events\evregion.c" />
-    <ClCompile Include="..\..\source\components\events\evrgnini.c" />
-    <ClCompile Include="..\..\source\components\events\evxfregn.c" />
-    <ClCompile Include="..\..\source\components\executer\exconcat.c" />
-    <ClCompile Include="..\..\source\components\executer\exconfig.c" />
-    <ClCompile Include="..\..\source\components\executer\exconvrt.c" />
-    <ClCompile Include="..\..\source\components\executer\excreate.c" />
-    <ClCompile Include="..\..\source\components\executer\exdump.c" />
-    <ClCompile Include="..\..\source\components\executer\exfield.c" />
-    <ClCompile Include="..\..\source\components\executer\exfldio.c" />
-    <ClCompile Include="..\..\source\components\executer\exmisc.c" />
-    <ClCompile Include="..\..\source\components\executer\exmutex.c" />
-    <ClCompile Include="..\..\source\components\executer\exnames.c" />
-    <ClCompile Include="..\..\source\components\executer\exoparg1.c" />
-    <ClCompile Include="..\..\source\components\executer\exoparg2.c" />
-    <ClCompile Include="..\..\source\components\executer\exoparg3.c" />
-    <ClCompile Include="..\..\source\components\executer\exoparg6.c" />
-    <ClCompile Include="..\..\source\components\executer\exprep.c" />
-    <ClCompile Include="..\..\source\components\executer\exregion.c" />
-    <ClCompile Include="..\..\source\components\executer\exresnte.c" />
-    <ClCompile Include="..\..\source\components\executer\exresolv.c" />
-    <ClCompile Include="..\..\source\components\executer\exresop.c" />
-    <ClCompile Include="..\..\source\components\executer\exserial.c" />
-    <ClCompile Include="..\..\source\components\executer\exstore.c" />
-    <ClCompile Include="..\..\source\components\executer\exstoren.c" />
-    <ClCompile Include="..\..\source\components\executer\exstorob.c" />
-    <ClCompile Include="..\..\source\components\executer\exsystem.c" />
-    <ClCompile Include="..\..\source\components\executer\exutils.c" />
-    <ClCompile Include="..\..\source\components\hardware\hwpci.c" />
-    <ClCompile Include="..\..\source\components\hardware\hwvalid.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsaccess.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsalloc.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsarguments.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsconvert.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsdump.c" />
-    <ClCompile Include="..\..\source\components\namespace\nseval.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsinit.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsload.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsnames.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsobject.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsparse.c" />
-    <ClCompile Include="..\..\source\components\namespace\nspredef.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsprepkg.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsrepair.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsrepair2.c" />
-    <ClCompile Include="..\..\source\components\namespace\nssearch.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsutils.c" />
-    <ClCompile Include="..\..\source\components\namespace\nswalk.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsxfeval.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsxfname.c" />
-    <ClCompile Include="..\..\source\components\namespace\nsxfobj.c" />
-    <ClCompile Include="..\..\source\components\parser\psargs.c" />
-    <ClCompile Include="..\..\source\components\parser\psloop.c" />
-    <ClCompile Include="..\..\source\components\parser\psobject.c" />
-    <ClCompile Include="..\..\source\components\parser\psopcode.c" />
-    <ClCompile Include="..\..\source\components\parser\psopinfo.c" />
-    <ClCompile Include="..\..\source\components\parser\psparse.c" />
-    <ClCompile Include="..\..\source\components\parser\psscope.c" />
-    <ClCompile Include="..\..\source\components\parser\pstree.c" />
-    <ClCompile Include="..\..\source\components\parser\psutils.c" />
-    <ClCompile Include="..\..\source\components\parser\pswalk.c" />
-    <ClCompile Include="..\..\source\components\parser\psxface.c" />
-    <ClCompile Include="..\..\source\components\tables\tbdata.c" />
-    <ClCompile Include="..\..\source\components\tables\tbfadt.c" />
-    <ClCompile Include="..\..\source\components\tables\tbfind.c" />
-    <ClCompile Include="..\..\source\components\tables\tbinstal.c" />
-    <ClCompile Include="..\..\source\components\tables\tbprint.c" />
-    <ClCompile Include="..\..\source\components\tables\tbutils.c" />
-    <ClCompile Include="..\..\source\components\tables\tbxface.c" />
-    <ClCompile Include="..\..\source\components\tables\tbxfload.c" />
-    <ClCompile Include="..\..\source\components\tables\tbxfroot.c" />
-    <ClCompile Include="..\..\source\components\utilities\utaddress.c" />
-    <ClCompile Include="..\..\source\components\utilities\utalloc.c" />
-    <ClCompile Include="..\..\source\components\utilities\utascii.c" />
-    <ClCompile Include="..\..\source\components\utilities\utbuffer.c" />
-    <ClCompile Include="..\..\source\components\utilities\utcache.c" />
-    <ClCompile Include="..\..\source\components\utilities\utcopy.c" />
-    <ClCompile Include="..\..\source\components\utilities\utdebug.c" />
-    <ClCompile Include="..\..\source\components\utilities\utdecode.c" />
-    <ClCompile Include="..\..\source\components\utilities\utdelete.c" />
-    <ClCompile Include="..\..\source\components\utilities\uterror.c" />
-    <ClCompile Include="..\..\source\components\utilities\uteval.c" />
-    <ClCompile Include="..\..\source\components\utilities\utexcep.c" />
-    <ClCompile Include="..\..\source\components\utilities\utglobal.c" />
-    <ClCompile Include="..\..\source\components\utilities\uthex.c" />
-    <ClCompile Include="..\..\source\components\utilities\utids.c" />
-    <ClCompile Include="..\..\source\components\utilities\utinit.c" />
-    <ClCompile Include="..\..\source\components\utilities\utlock.c" />
-    <ClCompile Include="..\..\source\components\utilities\utmath.c">
-      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</DisableLanguageExtensions>
-      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utmisc.c">
-      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
-      <UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;WIN32;_CONSOLE;ACPI_NAMES_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;WIN32;_CONSOLE;ACPI_NAMES_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefinePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utmutex.c" />
-    <ClCompile Include="..\..\source\components\utilities\utnonansi.c" />
-    <ClCompile Include="..\..\source\components\utilities\utobject.c" />
-    <ClCompile Include="..\..\source\components\utilities\utosi.c" />
-    <ClCompile Include="..\..\source\components\utilities\utownerid.c" />
-    <ClCompile Include="..\..\source\components\utilities\utpredef.c" />
-    <ClCompile Include="..\..\source\components\utilities\utresrc.c" />
-    <ClCompile Include="..\..\source\components\utilities\utstate.c" />
-    <ClCompile Include="..\..\source\components\utilities\utstring.c" />
-    <ClCompile Include="..\..\source\components\utilities\utstrsuppt.c" />
-    <ClCompile Include="..\..\source\components\utilities\utstrtoul64.c" />
-    <ClCompile Include="..\..\source\components\utilities\utuuid.c" />
-    <ClCompile Include="..\..\source\components\utilities\utxface.c" />
-    <ClCompile Include="..\..\source\components\utilities\utxferror.c" />
-    <ClCompile Include="..\..\source\components\utilities\utxfinit.c" />
-    <ClCompile Include="..\..\source\os_specific\service_layers\oswinxf.c">
-      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</DisableLanguageExtensions>
-      <DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\AcpiNames\anmain.c" />
-    <ClCompile Include="..\..\source\tools\AcpiNames\anstubs.c" />
-    <ClCompile Include="..\..\source\tools\AcpiNames\antables.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\source\include\platform\acwin.h" />
-    <ClInclude Include="..\..\source\tools\AcpiNames\AcpiNames.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/generate/msvc2017/AcpiNames.vcxproj.filters b/generate/msvc2017/AcpiNames.vcxproj.filters
deleted file mode 100755
index b53d05d5d..000000000
--- a/generate/msvc2017/AcpiNames.vcxproj.filters
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{b4452592-b596-48ca-813a-0e3f9692c364}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{6b4998eb-447e-4700-b7fd-91b3448933c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Utilities">
-      <UniqueIdentifier>{a0162563-3339-4c43-9653-84028be5a93c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Tables">
-      <UniqueIdentifier>{e0f47e3c-64cc-4d8d-96c7-5c8a0aab50d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Namespace">
-      <UniqueIdentifier>{49ce80cd-6cd7-45fa-8e71-26b21101ad32}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Parser">
-      <UniqueIdentifier>{6fc99645-6a38-4273-90f6-ee246b5e05c6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Debugger">
-      <UniqueIdentifier>{eac5c4c5-f5b9-4770-9457-b2494fca1adf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dispatcher">
-      <UniqueIdentifier>{19da18b8-8f39-448f-90ba-af42b5e945e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Executer">
-      <UniqueIdentifier>{45d099b9-2044-46c5-a8a0-c8cd2fb8adec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{3a92a967-2a00-482f-90aa-4126dc177c3c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{1dd4c807-b6c5-4b9a-802d-2b5fa213788b}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Events">
-      <UniqueIdentifier>{29defa3a-31e6-4de7-8525-c631cdae79fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Hardware">
-      <UniqueIdentifier>{b8e8c6d5-af0e-42f7-bf41-63fa785acd58}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\source\common\acfileio.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\cmfsize.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\common\getopt.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\os_specific\service_layers\oswinxf.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utaddress.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utalloc.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utascii.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utbuffer.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utcache.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utdebug.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utdecode.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utdelete.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\uterror.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\uteval.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utexcep.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utglobal.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\uthex.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utids.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utinit.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utlock.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utmath.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utmisc.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utmutex.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utnonansi.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utobject.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utosi.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utownerid.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utstate.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utstring.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utstrtoul64.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utuuid.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utxface.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utxferror.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utxfinit.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbdata.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbfadt.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbfind.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbinstal.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbprint.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbutils.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbxface.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbxfload.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\tables\tbxfroot.c">
-      <Filter>Source Files\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsaccess.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsalloc.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsconvert.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsdump.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsinit.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsload.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsnames.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsobject.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsparse.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nssearch.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsutils.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nswalk.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsxfeval.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsxfname.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsxfobj.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psargs.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psloop.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psobject.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psopcode.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psopinfo.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psparse.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psscope.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\pstree.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psutils.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\pswalk.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\parser\psxface.c">
-      <Filter>Source Files\Parser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\debugger\dbfileio.c">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsfield.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsinit.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsmthdat.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsobject.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsutils.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dswload.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dswload2.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dswscope.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dswstate.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exconvrt.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\excreate.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exdump.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exmutex.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exnames.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exprep.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exresnte.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exresolv.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exsystem.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exutils.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\AcpiNames\anmain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\AcpiNames\anstubs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\tools\AcpiNames\antables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utstrsuppt.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dspkginit.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dswexec.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exoparg1.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exoparg2.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exoparg3.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exoparg6.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dscontrol.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsopcode.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exresop.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exmisc.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exconfig.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exstore.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\events\evregion.c">
-      <Filter>Source Files\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\events\evhandler.c">
-      <Filter>Source Files\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exconcat.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\events\evrgnini.c">
-      <Filter>Source Files\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exregion.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\events\evxfregn.c">
-      <Filter>Source Files\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exstoren.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utresrc.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\hardware\hwpci.c">
-      <Filter>Source Files\Hardware</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exstorob.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\hardware\hwvalid.c">
-      <Filter>Source Files\Hardware</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\events\evmisc.c">
-      <Filter>Source Files\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsmethod.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\dispatcher\dsdebug.c">
-      <Filter>Source Files\Dispatcher</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utcopy.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exfield.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exfldio.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\executer\exserial.c">
-      <Filter>Source Files\Executer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nseval.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\utilities\utpredef.c">
-      <Filter>Source Files\Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsarguments.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nspredef.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsprepkg.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsrepair.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\components\namespace\nsrepair2.c">
-      <Filter>Source Files\Namespace</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\source\tools\AcpiNames\AcpiNames.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\include\platform\acwin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/generate/msvc2017/AcpiNames.vcxproj.user b/generate/msvc2017/AcpiNames.vcxproj.user
deleted file mode 100755
index da409b2b8..000000000
--- a/generate/msvc2017/AcpiNames.vcxproj.user
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>
-    </LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>
-    </LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
index 742874566..b46634367 100644
--- a/generate/unix/Makefile.config
+++ b/generate/unix/Makefile.config
@@ -2,8 +2,8 @@
 # Makefile.config
 #
 # Common configuration and setup file to generate the ACPICA tools and
-# utilities: the iASL compiler, acpiexec, acpihelp, acpinames, acpisrc,
-# acpixtract, acpibin.
+# utilities: the iASL compiler, acpiexec, acpihelp, acpisrc, acpixtract,
+# acpibin.
 #
 # This file is included by the individual makefiles for each tool.
 #
@@ -33,7 +33,7 @@
 #     not be necessary to change it.
 #
 .SUFFIXES :
-PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
+PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpisrc acpixtract iasl
 ACPI_HOST ?= _CYGWIN
 CC ?=    gcc
 
@@ -129,7 +129,6 @@ ACPIDUMP =              $(ACPICA_TOOLS)/acpidump
 ACPIEXAMPLES =          $(ACPICA_TOOLS)/examples
 ACPIEXEC =              $(ACPICA_TOOLS)/acpiexec
 ACPIHELP =              $(ACPICA_TOOLS)/acpihelp
-ACPINAMES =             $(ACPICA_TOOLS)/acpinames
 ACPISRC =               $(ACPICA_TOOLS)/acpisrc
 ACPIXTRACT =            $(ACPICA_TOOLS)/acpixtract
 ASL_COMPILER =          $(ACPICA_SRC)/compiler
diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile
deleted file mode 100644
index 90d3afe29..000000000
--- a/generate/unix/acpinames/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-# acpinames - Load ACPI table and dump namespace. This is a subset
-# of the AcpiExec functionality, it is intended to demonstrate
-# the configurability of ACPICA.
-#
-
-#
-# Note: This makefile is intended to be used from within the native
-# ACPICA directory structure, from under generate/unix. It specifically
-# places all object files in a generate/unix subdirectory, not within
-# the various ACPICA source directories. This prevents collisions
-# between different compilations of the same source file with different
-# compile options, and prevents pollution of the source code.
-#
-include ../Makefile.config
-FINAL_PROG = ../$(BINDIR)/acpinames
-PROG = $(OBJDIR)/acpinames
-
-#
-# Search paths for source files
-#
-vpath %.c \
-    $(ACPINAMES)\
-    $(ACPICA_DISPATCHER)\
-    $(ACPICA_EVENTS)\
-    $(ACPICA_EXECUTER)\
-    $(ACPICA_HARDWARE)\
-    $(ACPICA_NAMESPACE)\
-    $(ACPICA_PARSER)\
-    $(ACPICA_TABLES)\
-    $(ACPICA_UTILITIES)\
-    $(ACPICA_COMMON)\
-    $(ACPICA_OSL)
-
-HEADERS = \
-    $(wildcard $(ACPINAMES)/*.h)
-
-OBJECTS = \
-	$(OBJDIR)/acfileio.o\
-	$(OBJDIR)/anmain.o\
-	$(OBJDIR)/anstubs.o\
-	$(OBJDIR)/antables.o\
-	$(OBJDIR)/cmfsize.o\
-	$(OBJDIR)/dscontrol.o\
-	$(OBJDIR)/dsdebug.o\
-	$(OBJDIR)/dsfield.o\
-	$(OBJDIR)/dsinit.o\
-	$(OBJDIR)/dsmethod.o\
-	$(OBJDIR)/dsmthdat.o\
-	$(OBJDIR)/dsobject.o\
-	$(OBJDIR)/dsopcode.o\
-	$(OBJDIR)/dspkginit.o\
-	$(OBJDIR)/dsutils.o\
-	$(OBJDIR)/dswexec.o\
-	$(OBJDIR)/dswload.o\
-	$(OBJDIR)/dswload2.o\
-	$(OBJDIR)/dswscope.o\
-	$(OBJDIR)/dswstate.o\
-	$(OBJDIR)/evhandler.o\
-	$(OBJDIR)/evmisc.o\
-	$(OBJDIR)/evregion.o\
-	$(OBJDIR)/evrgnini.o\
-	$(OBJDIR)/evxfregn.o\
-	$(OBJDIR)/exconcat.o\
-	$(OBJDIR)/exconfig.o\
-	$(OBJDIR)/exconvrt.o\
-	$(OBJDIR)/excreate.o\
-	$(OBJDIR)/exdump.o\
-	$(OBJDIR)/exfield.o\
-	$(OBJDIR)/exfldio.o\
-	$(OBJDIR)/exmisc.o\
-	$(OBJDIR)/exmutex.o\
-	$(OBJDIR)/exnames.o\
-	$(OBJDIR)/exoparg1.o\
-	$(OBJDIR)/exoparg2.o\
-	$(OBJDIR)/exoparg3.o\
-	$(OBJDIR)/exoparg6.o\
-	$(OBJDIR)/exprep.o\
-	$(OBJDIR)/exregion.o\
-	$(OBJDIR)/exresnte.o\
-	$(OBJDIR)/exresolv.o\
-	$(OBJDIR)/exresop.o\
-	$(OBJDIR)/exserial.o\
-	$(OBJDIR)/exstore.o\
-	$(OBJDIR)/exstoren.o\
-	$(OBJDIR)/exstorob.o\
-	$(OBJDIR)/exsystem.o\
-	$(OBJDIR)/exutils.o\
-	$(OBJDIR)/getopt.o\
-	$(OBJDIR)/hwpci.o\
-	$(OBJDIR)/hwvalid.o\
-	$(OBJDIR)/nsaccess.o\
-	$(OBJDIR)/nsalloc.o\
-	$(OBJDIR)/nsarguments.o\
-	$(OBJDIR)/nsconvert.o\
-	$(OBJDIR)/nsdump.o\
-	$(OBJDIR)/nseval.o\
-	$(OBJDIR)/nsinit.o\
-	$(OBJDIR)/nsload.o\
-	$(OBJDIR)/nsnames.o\
-	$(OBJDIR)/nsobject.o\
-	$(OBJDIR)/nsparse.o\
-	$(OBJDIR)/nspredef.o\
-	$(OBJDIR)/nsprepkg.o\
-	$(OBJDIR)/nsrepair.o\
-	$(OBJDIR)/nsrepair2.o\
-	$(OBJDIR)/nssearch.o\
-	$(OBJDIR)/nsutils.o\
-	$(OBJDIR)/nswalk.o\
-	$(OBJDIR)/nsxfeval.o\
-	$(OBJDIR)/nsxfname.o\
-	$(OBJDIR)/nsxfobj.o\
-	$(OBJDIR)/osunixxf.o\
-	$(OBJDIR)/psargs.o\
-	$(OBJDIR)/psloop.o\
-	$(OBJDIR)/psobject.o\
-	$(OBJDIR)/psopcode.o\
-	$(OBJDIR)/psopinfo.o\
-	$(OBJDIR)/psparse.o\
-	$(OBJDIR)/psscope.o\
-	$(OBJDIR)/pstree.o\
-	$(OBJDIR)/psutils.o\
-	$(OBJDIR)/pswalk.o\
-	$(OBJDIR)/psxface.o\
-	$(OBJDIR)/tbdata.o\
-	$(OBJDIR)/tbfadt.o\
-	$(OBJDIR)/tbfind.o\
-	$(OBJDIR)/tbinstal.o\
-	$(OBJDIR)/tbprint.o\
-	$(OBJDIR)/tbutils.o\
-	$(OBJDIR)/tbxface.o\
-	$(OBJDIR)/tbxfload.o\
-	$(OBJDIR)/tbxfroot.o\
-	$(OBJDIR)/utaddress.o\
-	$(OBJDIR)/utalloc.o\
-	$(OBJDIR)/utascii.o\
-	$(OBJDIR)/utbuffer.o\
-	$(OBJDIR)/utcache.o\
-	$(OBJDIR)/utcopy.o\
-	$(OBJDIR)/utdebug.o\
-	$(OBJDIR)/utdecode.o\
-	$(OBJDIR)/utdelete.o\
-	$(OBJDIR)/uterror.o\
-	$(OBJDIR)/uteval.o\
-	$(OBJDIR)/utexcep.o\
-	$(OBJDIR)/utglobal.o\
-	$(OBJDIR)/uthex.o\
-	$(OBJDIR)/utids.o\
-	$(OBJDIR)/utinit.o\
-	$(OBJDIR)/utlock.o\
-	$(OBJDIR)/utmath.o\
-	$(OBJDIR)/utmisc.o\
-	$(OBJDIR)/utmutex.o\
-	$(OBJDIR)/utnonansi.o\
-	$(OBJDIR)/utobject.o\
-	$(OBJDIR)/utosi.o\
-	$(OBJDIR)/utownerid.o\
-	$(OBJDIR)/utpredef.o\
-	$(OBJDIR)/utresrc.o\
-	$(OBJDIR)/utstate.o\
-	$(OBJDIR)/utstring.o\
-	$(OBJDIR)/utstrsuppt.o\
-	$(OBJDIR)/utstrtoul64.o\
-	$(OBJDIR)/utxface.o\
-	$(OBJDIR)/utxferror.o\
-	$(OBJDIR)/utxfinit.o
-
-#
-# Flags specific to acpinames utility
-#
-CFLAGS += \
-    -DACPI_NAMES_APP\
-    -I$(ACPINAMES)
-
-#
-# Common Rules
-#
-include ../Makefile.rules