Message ID | 1334188256-26566-4-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On Thu, Apr 12, 2012 at 7:50 AM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpica/Makefile.am | 5 +++++ > src/acpica/source/compiler/Makefile.am | 18 +++++++++++++++++- > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am > index f042a1a..9da918a 100644 > --- a/src/acpica/Makefile.am > +++ b/src/acpica/Makefile.am > @@ -59,6 +59,7 @@ libfwtsacpica_la_SOURCES = \ > $(ACPICA_COMP)/disassembler/dmresrcs.c \ > $(ACPICA_COMP)/disassembler/dmutils.c \ > $(ACPICA_COMP)/disassembler/dmwalk.c \ > + $(ACPICA_COMP)/disassembler/dmresrcl2.c \ > $(ACPICA_COMP)/dispatcher/dsfield.c \ > $(ACPICA_COMP)/dispatcher/dsinit.c \ > $(ACPICA_COMP)/dispatcher/dsmethod.c \ > @@ -117,6 +118,8 @@ libfwtsacpica_la_SOURCES = \ > $(ACPICA_COMP)/hardware/hwsleep.c \ > $(ACPICA_COMP)/hardware/hwvalid.c \ > $(ACPICA_COMP)/hardware/hwxface.c \ > + $(ACPICA_COMP)/hardware/hwxfsleep.c \ > + $(ACPICA_COMP)/hardware/hwesleep.c \ > $(ACPICA_COMP)/namespace/nsaccess.c \ > $(ACPICA_COMP)/namespace/nsalloc.c \ > $(ACPICA_COMP)/namespace/nsdump.c \ > @@ -157,12 +160,14 @@ libfwtsacpica_la_SOURCES = \ > $(ACPICA_COMP)/resources/rsmisc.c \ > $(ACPICA_COMP)/resources/rsutils.c \ > $(ACPICA_COMP)/resources/rsxface.c \ > + $(ACPICA_COMP)/resources/rsserial.c \ > $(ACPICA_COMP)/tables/tbfadt.c \ > $(ACPICA_COMP)/tables/tbfind.c \ > $(ACPICA_COMP)/tables/tbinstal.c \ > $(ACPICA_COMP)/tables/tbutils.c \ > $(ACPICA_COMP)/tables/tbxface.c \ > $(ACPICA_COMP)/tables/tbxfroot.c \ > + $(ACPICA_COMP)/utilities/utaddress.c \ > $(ACPICA_COMP)/utilities/utalloc.c \ > $(ACPICA_COMP)/utilities/utcache.c \ > $(ACPICA_COMP)/utilities/utcopy.c \ > diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am > index a79467c..91db20b 100644 > --- a/src/acpica/source/compiler/Makefile.am > +++ b/src/acpica/source/compiler/Makefile.am > @@ -40,10 +40,19 @@ dtparserparse.c: dtparser.y > dtparserlex.c: dtparser.l > ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c dtparser.l > > +prparserparse.c: prparser.y > + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser prparser.y > + mv prparser.tab.c prparserparse.c > + mv prparser.tab.h prparser.y.h > + > +prparserlex.c: prparser.l > + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l > + > lib_LTLIBRARIES = libfwtsiasl.la > > BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ > - dtparserparse.c dtparserlex.c > + dtparserparse.c dtparserlex.c \ > + prparserparse.c prparserlex.c > > # > # Just export fwts specific API so we don't clash with core ACPICA library > @@ -98,6 +107,13 @@ libfwtsiasl_la_SOURCES = \ > $(ACPICA_COMPILER)/dtcompile.c \ > $(ACPICA_COMPILER)/dtparserparse.c \ > $(ACPICA_COMPILER)/dtparserlex.c \ > + $(ACPICA_COMPILER)/prparserparse.c \ > + $(ACPICA_COMPILER)/prparserlex.c \ > + $(ACPICA_COMPILER)/prscan.c \ > + $(ACPICA_COMPILER)/aslrestype2s.c \ > + $(ACPICA_COMPILER)/prmacros.c \ > + $(ACPICA_COMPILER)/prutils.c \ > + $(ACPICA_COMPILER)/prexpress.c \ > $(ACPICA_UTILS)/utalloc.c \ > $(ACPICA_UTILS)/utcache.c \ > $(ACPICA_UTILS)/utcopy.c \ > -- > 1.7.9.5 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am index f042a1a..9da918a 100644 --- a/src/acpica/Makefile.am +++ b/src/acpica/Makefile.am @@ -59,6 +59,7 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/disassembler/dmresrcs.c \ $(ACPICA_COMP)/disassembler/dmutils.c \ $(ACPICA_COMP)/disassembler/dmwalk.c \ + $(ACPICA_COMP)/disassembler/dmresrcl2.c \ $(ACPICA_COMP)/dispatcher/dsfield.c \ $(ACPICA_COMP)/dispatcher/dsinit.c \ $(ACPICA_COMP)/dispatcher/dsmethod.c \ @@ -117,6 +118,8 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/hardware/hwsleep.c \ $(ACPICA_COMP)/hardware/hwvalid.c \ $(ACPICA_COMP)/hardware/hwxface.c \ + $(ACPICA_COMP)/hardware/hwxfsleep.c \ + $(ACPICA_COMP)/hardware/hwesleep.c \ $(ACPICA_COMP)/namespace/nsaccess.c \ $(ACPICA_COMP)/namespace/nsalloc.c \ $(ACPICA_COMP)/namespace/nsdump.c \ @@ -157,12 +160,14 @@ libfwtsacpica_la_SOURCES = \ $(ACPICA_COMP)/resources/rsmisc.c \ $(ACPICA_COMP)/resources/rsutils.c \ $(ACPICA_COMP)/resources/rsxface.c \ + $(ACPICA_COMP)/resources/rsserial.c \ $(ACPICA_COMP)/tables/tbfadt.c \ $(ACPICA_COMP)/tables/tbfind.c \ $(ACPICA_COMP)/tables/tbinstal.c \ $(ACPICA_COMP)/tables/tbutils.c \ $(ACPICA_COMP)/tables/tbxface.c \ $(ACPICA_COMP)/tables/tbxfroot.c \ + $(ACPICA_COMP)/utilities/utaddress.c \ $(ACPICA_COMP)/utilities/utalloc.c \ $(ACPICA_COMP)/utilities/utcache.c \ $(ACPICA_COMP)/utilities/utcopy.c \ diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am index a79467c..91db20b 100644 --- a/src/acpica/source/compiler/Makefile.am +++ b/src/acpica/source/compiler/Makefile.am @@ -40,10 +40,19 @@ dtparserparse.c: dtparser.y dtparserlex.c: dtparser.l ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c dtparser.l +prparserparse.c: prparser.y + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser prparser.y + mv prparser.tab.c prparserparse.c + mv prparser.tab.h prparser.y.h + +prparserlex.c: prparser.l + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l + lib_LTLIBRARIES = libfwtsiasl.la BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ - dtparserparse.c dtparserlex.c + dtparserparse.c dtparserlex.c \ + prparserparse.c prparserlex.c # # Just export fwts specific API so we don't clash with core ACPICA library @@ -98,6 +107,13 @@ libfwtsiasl_la_SOURCES = \ $(ACPICA_COMPILER)/dtcompile.c \ $(ACPICA_COMPILER)/dtparserparse.c \ $(ACPICA_COMPILER)/dtparserlex.c \ + $(ACPICA_COMPILER)/prparserparse.c \ + $(ACPICA_COMPILER)/prparserlex.c \ + $(ACPICA_COMPILER)/prscan.c \ + $(ACPICA_COMPILER)/aslrestype2s.c \ + $(ACPICA_COMPILER)/prmacros.c \ + $(ACPICA_COMPILER)/prutils.c \ + $(ACPICA_COMPILER)/prexpress.c \ $(ACPICA_UTILS)/utalloc.c \ $(ACPICA_UTILS)/utcache.c \ $(ACPICA_UTILS)/utcopy.c \