diff options
author | jkim <jkim@FreeBSD.org> | 2011-04-15 18:34:27 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2011-04-15 18:34:27 +0000 |
commit | 11c809baa12ad68f12744b6dd5148d56b2555e72 (patch) | |
tree | e85ad1cacd03dfd5568f818085557ac68ceafdd8 /usr.sbin | |
parent | 5c6bf378652cfb00b5bdb569b2be605c2bab0ab3 (diff) | |
parent | 2b848536825a88fa2abd8e60fd768c4b337627de (diff) | |
download | FreeBSD-src-11c809baa12ad68f12744b6dd5148d56b2555e72.zip FreeBSD-src-11c809baa12ad68f12744b6dd5148d56b2555e72.tar.gz |
Merge ACPICA 20110413.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/acpi/acpidb/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/iasl/Makefile | 34 |
2 files changed, 26 insertions, 14 deletions
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 0bfb492..17e164f 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -14,9 +14,9 @@ SRCS+= dmbuffer.c dmnames.c dmobject.c dmopcode.c dmresrc.c \ dmresrcl.c dmresrcs.c dmutils.c dmwalk.c # events -SRCS+= evevent.c evgpe.c evgpeblk.c evgpeinit.c evgpeutil.c \ - evmisc.c evregion.c evrgnini.c evsci.c evxface.c \ - evxfevnt.c evxfgpe.c evxfregn.c +SRCS+= evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c \ + evgpeutil.c evmisc.c evregion.c evrgnini.c evsci.c \ + evxface.c evxfevnt.c evxfgpe.c evxfregn.c # hardware SRCS+= hwacpi.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwvalid.c \ diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index f91cbc8..62e0d77 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -10,7 +10,7 @@ SRCS+= dmextern.c dmrestag.c dmtable.c dmtbdump.c dmtbinfo.c \ # compiler SRCS+= aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c \ - aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y \ + aslcompiler.y.h aslcompilerlex.c aslcompilerparse.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 \ @@ -19,7 +19,8 @@ SRCS+= aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.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 + dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c \ + dttable.c dttemplate.c dtutils.c # debugger SRCS+= dbfileio.c @@ -62,20 +63,31 @@ MAN= iasl.8 CFLAGS+= -DACPI_ASL_COMPILER -I. CFLAGS+= -D_USE_BERKELEY_YACC -LFLAGS= -i -PAslCompiler -YFLAGS= -d -pAslCompiler +LFLAGS= -i -s +YFLAGS= -d DPADD= ${LIBPTHREAD} LDADD= -lpthread -CLEANFILES= aslcompiler.y.h aslcompilerlex.l aslcompilerparse.y +CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c \ + aslcompilerparse.h dtparser.y.h dtparserlex.c \ + dtparserparse.c dtparserparse.h -aslcompiler.y.h: aslcompilerparse.h - cat ${.ALLSRC} > ${.TARGET} +aslcompilerlex.c: aslcompiler.l + ${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} ${.ALLSRC} -aslcompilerlex.l: aslcompiler.l - cat ${.ALLSRC} > ${.TARGET} +aslcompilerparse.c: aslcompiler.y + ${YACC} ${YFLAGS} -pAslCompiler -o${.TARGET} ${.ALLSRC} -aslcompilerparse.y: aslcompiler.y - cat ${.ALLSRC} > ${.TARGET} +aslcompiler.y.h: aslcompilerparse.c + mv -f aslcompilerparse.h ${.TARGET} + +dtparserlex.c: dtparser.l + ${LEX} ${LFLAGS} -PDtParser -o${.TARGET} ${.ALLSRC} + +dtparserparse.c: dtparser.y + ${YACC} ${YFLAGS} -pDtParser -o${.TARGET} ${.ALLSRC} + +dtparser.y.h: dtparserparse.c + mv -f dtparserparse.h ${.TARGET} .include <bsd.prog.mk> |