adjust for new acpica trunk
authorchristos <christos@NetBSD.org>
Fri, 27 Dec 2013 21:33:46 +0000
branchtrunk
changeset 223369 db914a135124
parent 223368 ffc0c7e0291f
child 223370 b010d51601cb
adjust for new acpica
external/bsd/acpica/bin/iasl/Makefile
--- a/external/bsd/acpica/bin/iasl/Makefile	Fri Dec 27 21:11:19 2013 +0000
+++ b/external/bsd/acpica/bin/iasl/Makefile	Fri Dec 27 21:33:46 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/02/19 05:06:41 christos Exp $
+# $NetBSD: Makefile,v 1.6 2013/12/27 21:33:46 christos Exp $
 
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 PROG=	iasl
@@ -20,60 +20,199 @@
 DPADD+=		${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
 
 DPSRCS= aslcompilerparse.c aslcompilerlex.c \
-	dtparserparse.c dtparserlex.c
+	dtparserparse.c dtparserlex.c prparserparse.c prparserlex.c
 
 .PATH:	${TOPDIR}
-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     \
-	dtparserparse.c dtparserlex.c				\
-	dtsubtable.c dttable.c dttemplate.c dtutils.c
+SRCS+= \
+	adfile.c \
+	aslanalyze.c \
+	aslbtypes.c \
+	aslcodegen.c \
+	aslcompile.c \
+	aslcompilerlex.c \
+	aslcompilerparse.c \
+	aslerror.c \
+	aslfileio.c \
+	aslfiles.c \
+	aslfold.c \
+	aslhex.c \
+	asllength.c \
+	asllisting.c \
+	asllistsup.c \
+	aslload.c \
+	asllookup.c \
+	aslmain.c \
+	aslmap.c \
+	aslmethod.c \
+	aslnamesp.c \
+	asloffset.c \
+	aslopcodes.c \
+	asloperands.c \
+	aslopt.c \
+	asloptions.c \
+	aslpredef.c \
+	aslprepkg.c \
+	aslresource.c \
+	aslrestype1.c \
+	aslrestype1i.c \
+	aslrestype2.c \
+	aslrestype2d.c \
+	aslrestype2e.c \
+	aslrestype2q.c \
+	aslrestype2s.c \
+	aslrestype2w.c \
+	aslstartup.c \
+	aslstubs.c \
+	asltransform.c \
+	asltree.c \
+	aslutils.c \
+	asluuid.c \
+	aslwalks.c \
+	aslxref.c \
+	dtcompile.c \
+	dtexpress.c \
+	dtfield.c \
+	dtio.c \
+	dtparserlex.c \
+	dtparserparse.c \
+	dtsubtable.c \
+	dttable.c \
+	dttemplate.c \
+	dtutils.c \
+	prexpress.c \
+	prmacros.c \
+	prparserlex.c \
+	prparserparse.c \
+	prscan.c \
+	prutils.c
 
 .PATH: ${TOPDIR}/../common
-SRCS+=  adisasm.c adwalk.c dmextern.c dmrestag.c dmtable.c \
-	dmtbdump.c dmtbinfo.c getopt.c
+SRCS+= \
+	adisasm.c \
+	adwalk.c \
+	ahpredef.c \
+	dmextern.c \
+	dmrestag.c \
+	dmtable.c \
+	dmtbdump.c \
+	dmtbinfo.c \
+	getopt.c
 
 .PATH: ${TOPDIR}/../debugger
 SRCS+=  dbfileio.c
 
 .PATH: ${TOPDIR}/../disassembler
-SRCS+=  dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c    \
-	dmresrcl.c dmresrcs.c dmutils.c dmwalk.c
+SRCS+= \
+	dmbuffer.c \
+	dmdeferred.c \
+	dmnames.c \
+	dmobject.c \
+	dmopcode.c \
+	dmresrc.c \
+	dmresrcl.c \
+	dmresrcl2.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     \
+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
+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
+SRCS+= \
+	psargs.c \
+	psloop.c \
+	psobject.c \
+	psopcode.c \
+	psopinfo.c \
+	psparse.c \
+	psscope.c \
+	pstree.c \
+	psutils.c \
+	pswalk.c
 
 .PATH: ${TOPDIR}/../tables
-SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
+SRCS+=	\
+	tbfadt.c \
+	tbinstal.c \
+	tbprint.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
+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
+SRCS+= \
+	utaddress.c \
+	utalloc.c \
+	utbuffer.c \
+	utcache.c \
+	utcopy.c \
+	utdebug.c \
+	utdecode.c \
+	utdelete.c \
+	uterror.c \
+	utexcep.c \
+	utglobal.c \
+	utinit.c \
+	utlock.c \
+	utmath.c \
+	utmisc.c \
+	utmutex.c \
+	utobject.c \
+	utosi.c \
+	utownerid.c \
+	utpredef.c \
+	utresrc.c \
+	utstate.c \
+	utstring.c \
+	utxface.c \
+	utxferror.c
 
 .PATH: ${TOPDIR}/../os_specific/service_layers
 SRCS+=	osunixxf.c
@@ -92,9 +231,18 @@
 dtparserlex.c: ${TOPDIR}/dtparser.l
 	${LEX} -i -PDtParser -o${.TARGET} ${.ALLSRC}
 
+prparserparse.c: ${TOPDIR}/prparser.y
+	${YACC} -v -d -o${.TARGET} -pPrParser ${.ALLSRC}
+	mv -f ${.PREFIX}.h prparser.y.h
+
+prparserlex.c: ${TOPDIR}/prparser.l
+	${LEX} -i -PPrParser -o${.TARGET} ${.ALLSRC}
+
 CLEANFILES+=	aslcompilerlex.c aslcompilerparse.c	\
 		aslcompiler.y.h aslcompilerparse.output \
 		dtparserlex.c dtparserparse.c		\
-		dtparser.y.h dtparserparse.output
+		dtparser.y.h dtparserparse.output	\
+		prparserlex.c dtparserparse.c		\
+		prparser.y.h dtparserparse.output	\
 
 .include <bsd.prog.mk>