Fix iasl(8).

external/bsd/acpica/bin/iasl/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/17 07:48:16 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/17 18:26:20 jruoho Exp $
 
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 PROG=	iasl
@@ -16,141 +16,61 @@ CPPFLAGS+=	-D_USE_BERKELEY_YACC
 LDADD+=		-ll -ly -lrt -lpthread
 DPADD+=		${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
 
-DPSRCS=	aslcompilerparse.c
+DPSRCS= aslcompilerparse.c
 DPSRCS+=aslcompilerlex.c
 
 .PATH:	${TOPDIR}
-SRCS=	aslcompilerparse.c
-SRCS+=	aslcompilerlex.c
-SRCS+=	aslanalyze.c
-SRCS+=	aslcodegen.c
-SRCS+=	aslcompile.c
-SRCS+=	aslerror.c
-SRCS+=	aslfiles.c
-SRCS+=	asllength.c
-SRCS+=	asllisting.c
-SRCS+=	aslload.c
-SRCS+=	asllookup.c
-SRCS+=	aslmain.c
-SRCS+=	aslmap.c
-SRCS+=	aslopcodes.c
-SRCS+=	asloperands.c
-SRCS+=	aslpredef.c
-SRCS+=	aslresource.c
-SRCS+=	aslrestype1.c
-SRCS+=	aslrestype1i.c
-SRCS+=	aslrestype2.c
-SRCS+=	aslrestype2d.c
-SRCS+=	aslrestype2e.c
-SRCS+=	aslrestype2q.c
-SRCS+=	aslrestype2w.c
-SRCS+=	aslstartup.c
-SRCS+=	asltree.c
-SRCS+=	aslutils.c
-SRCS+=	asltransform.c
-SRCS+=	aslfold.c
-SRCS+=	aslstubs.c
-SRCS+=	aslopt.c
-SRCS+=	dtcompile.c
-SRCS+=	dtfield.c
-SRCS+=	dtio.c
-SRCS+=	dtsubtable.c
-SRCS+=	dttable.c
-SRCS+=	dtutils.c
+SRCS+=  aslcompilerparse.c aslcompilerlex.c adfile.c \
+	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c      \
+	aslerror.c aslfiles.c aslfold.c asllength.c             \
+	asllisting.c aslload.c asllookup.c aslmain.c aslmap.c   \
+	aslopcodes.c asloperands.c aslopt.c aslpredef.c         \
+	aslresource.c aslrestype1.c aslrestype1i.c              \
+	aslrestype2.c aslrestype2d.c aslrestype2e.c             \
+	aslrestype2q.c aslrestype2w.c aslstartup.c aslstubs.c   \
+	asltransform.c asltree.c aslutils.c asluuid.c           \
+	aslwalks.c dtcompile.c dtexpress.c dtfield.c dtio.c     \
+	dtsubtable.c dttable.c dttemplate.c dtutils.c
+
 .PATH: ${TOPDIR}/../common
-SRCS+=	getopt.c
-.PATH: ${TOPDIR}/../utilities
-SRCS+=	utalloc.c
-SRCS+=	utcache.c
-SRCS+=	utcopy.c
-SRCS+=	utdebug.c
-SRCS+=	utdelete.c
-SRCS+=	utglobal.c
-SRCS+=	utinit.c
-SRCS+=	utlock.c
-SRCS+=	utobject.c
-SRCS+=	utmisc.c
-SRCS+=	utmath.c
-SRCS+=	utmutex.c
-SRCS+=	utresrc.c
-SRCS+=	utstate.c
-SRCS+=	utxface.c
-.PATH: ${TOPDIR}/../namespace
-SRCS+=	nsaccess.c
-SRCS+=	nsalloc.c
-SRCS+=	nsdump.c
-SRCS+=	nsnames.c
-SRCS+=	nsobject.c
-SRCS+=	nsparse.c
-SRCS+=	nssearch.c
-SRCS+=	nsutils.c
-SRCS+=	nswalk.c
-SRCS+=	nsxfobj.c
-.PATH: ${TOPDIR}/../parser
-SRCS+=	psargs.c
-SRCS+=	psloop.c
-SRCS+=	psopcode.c
-SRCS+=	psparse.c
-SRCS+=	psscope.c
-SRCS+=	pstree.c
-SRCS+=	psutils.c
-SRCS+=	pswalk.c
-.PATH: ${TOPDIR}/../dispatcher
-SRCS+=	dmextern.c
-SRCS+=	dswscope.c
-SRCS+=	dswstate.c
-SRCS+=	dsfield.c
-SRCS+=	dsobject.c
-SRCS+=	dsopcode.c
-SRCS+=	dsutils.c
-SRCS+=	dswexec.c
-SRCS+=	dswload.c
-.PATH: ${TOPDIR}/../executer
-SRCS+=	exconvrt.c
-SRCS+=	excreate.c
-SRCS+=	exdump.c
-SRCS+=	exmisc.c
-SRCS+=	exmutex.c
-SRCS+=	exnames.c
-SRCS+=	exoparg1.c
-SRCS+=	exoparg2.c
-SRCS+=	exoparg3.c
-SRCS+=	exoparg6.c
-SRCS+=	exprep.c
-SRCS+=	exregion.c
-SRCS+=	exresnte.c
-SRCS+=	exresolv.c
-SRCS+=	exresop.c
-SRCS+=	exstore.c
-SRCS+=	exstoren.c
-SRCS+=	exstorob.c
-SRCS+=	exsystem.c
-SRCS+=	exutils.c
-.PATH: ${TOPDIR}/../common
-SRCS+=	adfile.c
-SRCS+=	adisasm.c
-SRCS+=	adwalk.c
-SRCS+=	dmrestag.c
-SRCS+=	dmtable.c
-SRCS+=	dmtbinfo.c
-SRCS+=	dmtbdump.c
+SRCS+=  adisasm.c adwalk.c dmextern.c dmrestag.c dmtable.c \
+	dmtbdump.c dmtbinfo.c getopt.c
+
 .PATH: ${TOPDIR}/../debugger
-SRCS+=	dbfileio.c
+SRCS+=  dbfileio.c
+
 .PATH: ${TOPDIR}/../disassembler
-SRCS+=	dmbuffer.c
-SRCS+=	dmnames.c
-SRCS+=	dmopcode.c
-SRCS+=	dmobject.c
-SRCS+=	dmresrc.c
-SRCS+=	dmresrcl.c
-SRCS+=	dmresrcs.c
-SRCS+=	dmutils.c
-SRCS+=	dmwalk.c
+SRCS+=  dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c    \
+	dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+
+.PATH: ${TOPDIR}/../dispatcher
+SRCS+=  dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c    \
+	dsutils.c dswexec.c dswload.c dswload2.c dswscope.c     \
+	dswstate.c
+
+.PATH: ${TOPDIR}/../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
+
+.PATH: ${TOPDIR}/../parser
+SRCS+=  psargs.c psloop.c psopcode.c psparse.c psscope.c        \
+	pstree.c psutils.c pswalk.c
+
 .PATH: ${TOPDIR}/../tables
-SRCS+=	tbfadt.c
-SRCS+=	tbinstal.c
-SRCS+=	tbutils.c
-SRCS+=	tbxface.c
+SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
+
+.PATH: ${TOPDIR}/../namespace
+SRCS+=  nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c      \
+	nsparse.c nssearch.c nsutils.c nswalk.c nsxfobj.c
+
+.PATH: ${TOPDIR}/../utilities
+SRCS+=  utalloc.c utcache.c utcopy.c utdebug.c utdecode.c       \
+	utdelete.c utglobal.c utinit.c utlock.c utmath.c        \
+	utmisc.c utmutex.c utobject.c utosi.c utresrc.c         \
+	utstate.c utxface.c utxferror.c
+
 .PATH: ${TOPDIR}/..
 SRCS+=	osunixxf.c
 
@@ -161,6 +81,7 @@ aslcompilerparse.c: ${TOPDIR}/aslcompiler.y
 aslcompilerlex.c: ${TOPDIR}/aslcompiler.l
 	${LEX} -i -PAslCompiler -o${.TARGET} ${.ALLSRC}
 
-CLEANFILES+=	aslcompilerlex.c aslcompilerparse.c aslcompiler.y.h aslcompilerparse.output
+CLEANFILES+=	aslcompilerlex.c aslcompilerparse.c \
+		aslcompiler.y.h aslcompilerparse.output
 
 .include <bsd.prog.mk>