Catch up with ACPI-CA 20051021 import

1 files changed, 50 insertions, 28 deletions

diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index afe0d81..9b341c2 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,38 +1,60 @@
 # $FreeBSD$
 
 PROG=	iasl
-SRCS=	aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y \
-	aslanalyze.c aslcodegen.c \
-	aslcompile.c aslerror.c aslfiles.c asllength.c \
-	asllisting.c aslload.c asllookup.c aslmain.c \
-	aslmap.c aslopcodes.c asloperands.c aslresource.c \
-	aslrestype1.c aslrestype2.c asltree.c aslutils.c \
-	asltransform.c aslfold.c aslstubs.c aslopt.c
-SRCS+=	adisasm.c getopt.c osunixxf.c
-SRCS+=	dbfileio.c dmbuffer.c dmnames.c dmopcode.c dmobject.c \
-        dmresrc.c dmresrcl.c dmresrcs.c dmutils.c dmwalk.c \
-        dsopcode.c dsutils.c dswexec.c dswload.c \
-	dswscope.c dswstate.c dsfield.c dsobject.c \
-        exconvrt.c excreate.c exdump.c exmisc.c \
-        exmutex.c exnames.c exoparg1.c exoparg2.c \
-        exoparg3.c exoparg6.c exprep.c exregion.c \
-        exresnte.c exresolv.c exresop.c exstore.c \
-        exstoren.c exstorob.c exsystem.c exutils.c \
-        nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \
-	nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c \
-        psargs.c psopcode.c psparse.c psscope.c \
-        pstree.c psutils.c pswalk.c \
-        tbinstal.c tbutils.c \
-	utalloc.c utcopy.c utdebug.c utdelete.c \
-        utglobal.c utobject.c utmisc.c utmath.c
+SRCS=	adisasm.c
+SRCS+=	osunixxf.c
 
-MAN=	iasl.8
+# common
+SRCS+=	getopt.c
+
+# compiler
+SRCS+=	aslanalyze.c aslcodegen.c aslcompile.c aslcompiler.y.h	\
+	aslcompilerlex.l aslcompilerparse.y aslerror.c		\
+	aslfiles.c aslfold.c asllength.c asllisting.c		\
+	aslload.c asllookup.c aslmain.c aslmap.c aslopcodes.c	\
+	asloperands.c aslopt.c aslresource.c aslrestype1.c	\
+	aslrestype2.c aslstubs.c asltransform.c asltree.c	\
+	aslutils.c
+
+# debugger
+SRCS+=	dbfileio.c
+
+# disassembler
+SRCS+=	dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c	\
+	dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+
+# interpreter/dispatcher
+SRCS+=	dsfield.c dsobject.c dsopcode.c dsutils.c dswexec.c	\
+	dswload.c dswscope.c dswstate.c
+
+# interpreter/executer
+SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
+	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
+	exprep.c exregion.c exresnte.c exresolv.c exresop.c	\
+	exstore.c exstoren.c exstorob.c exsystem.c exutils.c
 
-CFLAGS+= -D_ACPI_ASL_COMPILER -I.
+# interpreter/parser
+SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c	\
+	pstree.c psutils.c pswalk.c
+
+# namespace
+SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
+	nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c
+
+# tables
+SRCS+=	tbinstal.c tbutils.c
+
+# utilities
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
+	utglobal.c utmath.c utmisc.c utmutex.c utobject.c	\
+	utstate.c
+
+MAN=	iasl.8
 
+CFLAGS+= -DACPI_ASL_COMPILER -I.
 CFLAGS+= -D_USE_BERKELEY_YACC
-LFLAGS=	-i -PAslCompiler
-YFLAGS=	-d -pAslCompiler
+LFLAGS= -i -PAslCompiler
+YFLAGS= -d -pAslCompiler
 
 CLEANFILES= aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y