ACK: [PATCH] Makefile.am: remove all traces of $srcdir and $top_srcdir in Makefile.am (LP: #1929138)
Alex Hung
alex.hung at canonical.com
Fri May 21 00:01:00 UTC 2021
On 2021-05-20 4:49 p.m., Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> BugLink: https://bugs.launchpad.net/bugs/1929138
>
> Turns out that using $(srcdir) or $(top_srcdir) in pre 1.16.1 automake
> is a bad idea for *_SOURCES as these can't be expanded and one ends up
> with directories being created with the unexanded names $(srcdir) and
> $(top_srcdir) being created. Just hard-code relative paths instead for
> the *_SOURCES and use $(top_srcdir) for include paths and paths not
> used in *_SOURCES.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> src/libfwtsacpica/Makefile.am | 416 +++++++++++++++---------------
> src/libfwtsiasl/Makefile.am | 470 +++++++++++++++++-----------------
> src/utilities/Makefile.am | 2 +-
> 3 files changed, 444 insertions(+), 444 deletions(-)
>
> diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am
> index 0f6cbcac..f37f5858 100644
> --- a/src/libfwtsacpica/Makefile.am
> +++ b/src/libfwtsacpica/Makefile.am
> @@ -24,8 +24,8 @@
> AM_CPPFLAGS = \
> -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP \
> -I$(top_srcdir)/src/lib/include \
> - -I$(srcdir)/../acpica/source/include \
> - -I$(srcdir)/../acpica/source/tools/acpiexec \
> + -I$(top_srcdir)/src/acpica/source/include \
> + -I$(top_srcdir)/src/acpica/source/tools/acpiexec \
> -Wall -fno-strict-aliasing \
> -Wno-address-of-packed-member
>
> @@ -33,7 +33,7 @@ AM_CPPFLAGS = \
> # We rename some of the functions so we can override them in fwts. This
> # is a hack, I feel dirty now.
> #
> -osunixxf_munged.c: ../acpica/source/os_specific/service_layers/osunixxf.c
> +osunixxf_munged.c: ../../src/acpica/source/os_specific/service_layers/osunixxf.c
> cat $^ | \
> sed 's/^AcpiOsPrintf/__AcpiOsPrintf/' | \
> sed 's/^AcpiOsReadPort/__AcpiOsReadPort/' | \
> @@ -52,7 +52,7 @@ osunixxf_munged.c: ../acpica/source/os_specific/service_layers/osunixxf.c
> # because we really don't want to wait until the sun turns into
> # a lump of coal before we complete a blocked operation
> #
> -dscontrol_munged.c: $(srcdir)/../acpica/source/components/dispatcher/dscontrol.c
> +dscontrol_munged.c: ../../src/acpica/source/components/dispatcher/dscontrol.c
> cat $^ | \
> sed 's/ACPI_MAX_LOOP_ITERATIONS/0x0080/' \
> > $@
> @@ -64,13 +64,13 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c
> #
> CLEANFILES = osunixxf_munged.c \
> dscontrol_munged.c \
> - $(srcdir)/../acpica/source/compiler/aslcompiler.output \
> - $(srcdir)/../acpica/source/compiler/dtparser.output \
> - $(srcdir)/../acpica/source/compiler/dtparser.y.h \
> - $(srcdir)/../acpica/source/compiler/prparser.output \
> - $(srcdir)/../acpica/source/compiler/prparser.y.h \
> - $(srcdir)/../acpica/source/compiler/prparserlex.c \
> - $(srcdir)/../acpica/source/compiler/prparserparse.c
> + ../src/acpica/source/compiler/aslcompiler.output \
> + ../src/acpica/source/compiler/dtparser.output \
> + ../src/acpica/source/compiler/dtparser.y.h \
> + ../src/acpica/source/compiler/prparser.output \
> + ../src/acpica/source/compiler/prparser.y.h \
> + ../src/acpica/source/compiler/prparserlex.c \
> + ../src/acpica/source/compiler/prparserparse.c
>
> pkglib_LTLIBRARIES = libfwtsacpica.la
>
> @@ -84,204 +84,204 @@ libfwtsacpica_la_SOURCES = \
> fwts_acpica.c \
> osunixxf_munged.c \
> dscontrol_munged.c \
> - $(srcdir)/../acpica/source/components/debugger/dbcmds.c \
> - $(srcdir)/../acpica/source/components/debugger/dbdisply.c \
> - $(srcdir)/../acpica/source/components/debugger/dbexec.c \
> - $(srcdir)/../acpica/source/components/debugger/dbfileio.c \
> - $(srcdir)/../acpica/source/components/debugger/dbhistry.c \
> - $(srcdir)/../acpica/source/components/debugger/dbinput.c \
> - $(srcdir)/../acpica/source/components/debugger/dbstats.c \
> - $(srcdir)/../acpica/source/components/debugger/dbobject.c \
> - $(srcdir)/../acpica/source/components/debugger/dbutils.c \
> - $(srcdir)/../acpica/source/components/debugger/dbxface.c \
> - $(srcdir)/../acpica/source/components/debugger/dbmethod.c \
> - $(srcdir)/../acpica/source/components/debugger/dbnames.c \
> - $(srcdir)/../acpica/source/components/debugger/dbconvert.c \
> - $(srcdir)/../acpica/source/components/debugger/dbtest.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmbuffer.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmcstyle.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmnames.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmopcode.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrc.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcl.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcs.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmutils.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmwalk.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcl2.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmdeferred.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsdebug.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsfield.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsinit.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsmethod.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsmthdat.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsobject.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dspkginit.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsutils.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswexec.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswload.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswscope.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswstate.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsargs.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswload2.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsopcode.c \
> - $(srcdir)/../acpica/source/components/events/evevent.c \
> - $(srcdir)/../acpica/source/components/events/evgpe.c \
> - $(srcdir)/../acpica/source/components/events/evgpeblk.c \
> - $(srcdir)/../acpica/source/components/events/evgpeinit.c \
> - $(srcdir)/../acpica/source/components/events/evgpeutil.c \
> - $(srcdir)/../acpica/source/components/events/evxfgpe.c \
> - $(srcdir)/../acpica/source/components/events/evmisc.c \
> - $(srcdir)/../acpica/source/components/events/evregion.c \
> - $(srcdir)/../acpica/source/components/events/evrgnini.c \
> - $(srcdir)/../acpica/source/components/events/evsci.c \
> - $(srcdir)/../acpica/source/components/events/evxface.c \
> - $(srcdir)/../acpica/source/components/events/evxfevnt.c \
> - $(srcdir)/../acpica/source/components/events/evxfregn.c \
> - $(srcdir)/../acpica/source/components/events/evglock.c \
> - $(srcdir)/../acpica/source/components/events/evhandler.c \
> - $(srcdir)/../acpica/source/components/executer/exconcat.c \
> - $(srcdir)/../acpica/source/components/executer/exfield.c \
> - $(srcdir)/../acpica/source/components/executer/exfldio.c \
> - $(srcdir)/../acpica/source/components/executer/exmisc.c \
> - $(srcdir)/../acpica/source/components/executer/exmutex.c \
> - $(srcdir)/../acpica/source/components/executer/exnames.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg1.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg2.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg3.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg6.c \
> - $(srcdir)/../acpica/source/components/executer/exprep.c \
> - $(srcdir)/../acpica/source/components/executer/exregion.c \
> - $(srcdir)/../acpica/source/components/executer/exresnte.c \
> - $(srcdir)/../acpica/source/components/executer/exresolv.c \
> - $(srcdir)/../acpica/source/components/executer/exresop.c \
> - $(srcdir)/../acpica/source/components/executer/exserial.c \
> - $(srcdir)/../acpica/source/components/executer/exstore.c \
> - $(srcdir)/../acpica/source/components/executer/exstoren.c \
> - $(srcdir)/../acpica/source/components/executer/exstorob.c \
> - $(srcdir)/../acpica/source/components/executer/exsystem.c \
> - $(srcdir)/../acpica/source/components/executer/extrace.c \
> - $(srcdir)/../acpica/source/components/executer/exutils.c \
> - $(srcdir)/../acpica/source/components/executer/exconvrt.c \
> - $(srcdir)/../acpica/source/components/executer/excreate.c \
> - $(srcdir)/../acpica/source/components/executer/exdump.c \
> - $(srcdir)/../acpica/source/components/executer/exdebug.c \
> - $(srcdir)/../acpica/source/components/executer/exconfig.c \
> - $(srcdir)/../acpica/source/components/hardware/hwacpi.c \
> - $(srcdir)/../acpica/source/components/hardware/hwgpe.c \
> - $(srcdir)/../acpica/source/components/hardware/hwpci.c \
> - $(srcdir)/../acpica/source/components/hardware/hwregs.c \
> - $(srcdir)/../acpica/source/components/hardware/hwsleep.c \
> - $(srcdir)/../acpica/source/components/hardware/hwvalid.c \
> - $(srcdir)/../acpica/source/components/hardware/hwxface.c \
> - $(srcdir)/../acpica/source/components/hardware/hwxfsleep.c \
> - $(srcdir)/../acpica/source/components/hardware/hwesleep.c \
> - $(srcdir)/../acpica/source/components/namespace/nsaccess.c \
> - $(srcdir)/../acpica/source/components/namespace/nsalloc.c \
> - $(srcdir)/../acpica/source/components/namespace/nsdump.c \
> - $(srcdir)/../acpica/source/components/namespace/nsdumpdv.c \
> - $(srcdir)/../acpica/source/components/namespace/nseval.c \
> - $(srcdir)/../acpica/source/components/namespace/nsinit.c \
> - $(srcdir)/../acpica/source/components/namespace/nsload.c \
> - $(srcdir)/../acpica/source/components/namespace/nsnames.c \
> - $(srcdir)/../acpica/source/components/namespace/nsobject.c \
> - $(srcdir)/../acpica/source/components/namespace/nsparse.c \
> - $(srcdir)/../acpica/source/components/namespace/nspredef.c \
> - $(srcdir)/../acpica/source/components/namespace/nsrepair.c \
> - $(srcdir)/../acpica/source/components/namespace/nsrepair2.c \
> - $(srcdir)/../acpica/source/components/namespace/nssearch.c \
> - $(srcdir)/../acpica/source/components/namespace/nsutils.c \
> - $(srcdir)/../acpica/source/components/namespace/nswalk.c \
> - $(srcdir)/../acpica/source/components/namespace/nsxfeval.c \
> - $(srcdir)/../acpica/source/components/namespace/nsxfname.c \
> - $(srcdir)/../acpica/source/components/namespace/nsxfobj.c \
> - $(srcdir)/../acpica/source/components/namespace/nsconvert.c \
> - $(srcdir)/../acpica/source/components/namespace/nsprepkg.c \
> - $(srcdir)/../acpica/source/components/namespace/nsarguments.c \
> - $(srcdir)/../acpica/source/components/parser/psargs.c \
> - $(srcdir)/../acpica/source/components/parser/psloop.c \
> - $(srcdir)/../acpica/source/components/parser/psopcode.c \
> - $(srcdir)/../acpica/source/components/parser/psparse.c \
> - $(srcdir)/../acpica/source/components/parser/psscope.c \
> - $(srcdir)/../acpica/source/components/parser/pstree.c \
> - $(srcdir)/../acpica/source/components/parser/psutils.c \
> - $(srcdir)/../acpica/source/components/parser/pswalk.c \
> - $(srcdir)/../acpica/source/components/parser/psxface.c \
> - $(srcdir)/../acpica/source/components/parser/psopinfo.c \
> - $(srcdir)/../acpica/source/components/parser/psobject.c \
> - $(srcdir)/../acpica/source/components/resources/rsaddr.c \
> - $(srcdir)/../acpica/source/components/resources/rscalc.c \
> - $(srcdir)/../acpica/source/components/resources/rscreate.c \
> - $(srcdir)/../acpica/source/components/resources/rsdump.c \
> - $(srcdir)/../acpica/source/components/resources/rsio.c \
> - $(srcdir)/../acpica/source/components/resources/rsinfo.c \
> - $(srcdir)/../acpica/source/components/resources/rsirq.c \
> - $(srcdir)/../acpica/source/components/resources/rslist.c \
> - $(srcdir)/../acpica/source/components/resources/rsmemory.c \
> - $(srcdir)/../acpica/source/components/resources/rsmisc.c \
> - $(srcdir)/../acpica/source/components/resources/rsutils.c \
> - $(srcdir)/../acpica/source/components/resources/rsxface.c \
> - $(srcdir)/../acpica/source/components/resources/rsserial.c \
> - $(srcdir)/../acpica/source/components/resources/rsdumpinfo.c \
> - $(srcdir)/../acpica/source/components/tables/tbdata.c \
> - $(srcdir)/../acpica/source/components/tables/tbfadt.c \
> - $(srcdir)/../acpica/source/components/tables/tbfind.c \
> - $(srcdir)/../acpica/source/components/tables/tbinstal.c \
> - $(srcdir)/../acpica/source/components/tables/tbutils.c \
> - $(srcdir)/../acpica/source/components/tables/tbxface.c \
> - $(srcdir)/../acpica/source/components/tables/tbxfroot.c \
> - $(srcdir)/../acpica/source/components/tables/tbxfload.c \
> - $(srcdir)/../acpica/source/components/tables/tbprint.c \
> - $(srcdir)/../acpica/source/components/utilities/utaddress.c \
> - $(srcdir)/../acpica/source/components/utilities/utalloc.c \
> - $(srcdir)/../acpica/source/components/utilities/utascii.c \
> - $(srcdir)/../acpica/source/components/utilities/utcache.c \
> - $(srcdir)/../acpica/source/components/utilities/utcopy.c \
> - $(srcdir)/../acpica/source/components/utilities/utdebug.c \
> - $(srcdir)/../acpica/source/components/utilities/utdelete.c \
> - $(srcdir)/../acpica/source/components/utilities/uteval.c \
> - $(srcdir)/../acpica/source/components/utilities/utglobal.c \
> - $(srcdir)/../acpica/source/components/utilities/uthex.c \
> - $(srcdir)/../acpica/source/components/utilities/utids.c \
> - $(srcdir)/../acpica/source/components/utilities/utinit.c \
> - $(srcdir)/../acpica/source/components/utilities/utlock.c \
> - $(srcdir)/../acpica/source/components/utilities/utmath.c \
> - $(srcdir)/../acpica/source/components/utilities/utmisc.c \
> - $(srcdir)/../acpica/source/components/utilities/utmutex.c \
> - $(srcdir)/../acpica/source/components/utilities/utnonansi.c \
> - $(srcdir)/../acpica/source/components/utilities/utobject.c \
> - $(srcdir)/../acpica/source/components/utilities/utresdecode.c \
> - $(srcdir)/../acpica/source/components/utilities/utresrc.c \
> - $(srcdir)/../acpica/source/components/utilities/utstate.c \
> - $(srcdir)/../acpica/source/components/utilities/utstrtoul64.c \
> - $(srcdir)/../acpica/source/components/utilities/uttrack.c \
> - $(srcdir)/../acpica/source/components/utilities/utosi.c \
> - $(srcdir)/../acpica/source/components/utilities/utxferror.c \
> - $(srcdir)/../acpica/source/components/utilities/utxface.c \
> - $(srcdir)/../acpica/source/components/utilities/utdecode.c \
> - $(srcdir)/../acpica/source/components/utilities/utexcep.c \
> - $(srcdir)/../acpica/source/components/utilities/utpredef.c \
> - $(srcdir)/../acpica/source/components/utilities/utstring.c \
> - $(srcdir)/../acpica/source/components/utilities/utstrsuppt.c \
> - $(srcdir)/../acpica/source/components/utilities/utownerid.c \
> - $(srcdir)/../acpica/source/components/utilities/utxfinit.c \
> - $(srcdir)/../acpica/source/components/utilities/uterror.c \
> - $(srcdir)/../acpica/source/components/utilities/utbuffer.c \
> - $(srcdir)/../acpica/source/components/utilities/utuuid.c \
> - $(srcdir)/../acpica/source/common/acfileio.c \
> - $(srcdir)/../acpica/source/common/acgetline.c \
> - $(srcdir)/../acpica/source/common/ahids.c \
> - $(srcdir)/../acpica/source/common/cmfsize.c \
> - $(srcdir)/../acpica/source/common/ahtable.c \
> - $(srcdir)/../acpica/source/common/ahuuids.c \
> - $(srcdir)/../acpica/source/tools/acpiexec/aeinitfile.c \
> - $(srcdir)/../acpica/source/tools/acpiexec/aehandlers.c \
> - $(srcdir)/../acpica/source/tools/acpiexec/aeexception.c \
> - $(srcdir)/../acpica/source/tools/acpiexec/aeregion.c \
> - $(srcdir)/../acpica/source/tools/acpiexec/aeinstall.c \
> - $(srcdir)/../acpica/source/os_specific/service_layers/osgendbg.c
> + ../../src/acpica/source/components/debugger/dbcmds.c \
> + ../../src/acpica/source/components/debugger/dbdisply.c \
> + ../../src/acpica/source/components/debugger/dbexec.c \
> + ../../src/acpica/source/components/debugger/dbfileio.c \
> + ../../src/acpica/source/components/debugger/dbhistry.c \
> + ../../src/acpica/source/components/debugger/dbinput.c \
> + ../../src/acpica/source/components/debugger/dbstats.c \
> + ../../src/acpica/source/components/debugger/dbobject.c \
> + ../../src/acpica/source/components/debugger/dbutils.c \
> + ../../src/acpica/source/components/debugger/dbxface.c \
> + ../../src/acpica/source/components/debugger/dbmethod.c \
> + ../../src/acpica/source/components/debugger/dbnames.c \
> + ../../src/acpica/source/components/debugger/dbconvert.c \
> + ../../src/acpica/source/components/debugger/dbtest.c \
> + ../../src/acpica/source/components/disassembler/dmbuffer.c \
> + ../../src/acpica/source/components/disassembler/dmcstyle.c \
> + ../../src/acpica/source/components/disassembler/dmnames.c \
> + ../../src/acpica/source/components/disassembler/dmopcode.c \
> + ../../src/acpica/source/components/disassembler/dmresrc.c \
> + ../../src/acpica/source/components/disassembler/dmresrcl.c \
> + ../../src/acpica/source/components/disassembler/dmresrcs.c \
> + ../../src/acpica/source/components/disassembler/dmutils.c \
> + ../../src/acpica/source/components/disassembler/dmwalk.c \
> + ../../src/acpica/source/components/disassembler/dmresrcl2.c \
> + ../../src/acpica/source/components/disassembler/dmdeferred.c \
> + ../../src/acpica/source/components/dispatcher/dsdebug.c \
> + ../../src/acpica/source/components/dispatcher/dsfield.c \
> + ../../src/acpica/source/components/dispatcher/dsinit.c \
> + ../../src/acpica/source/components/dispatcher/dsmethod.c \
> + ../../src/acpica/source/components/dispatcher/dsmthdat.c \
> + ../../src/acpica/source/components/dispatcher/dsobject.c \
> + ../../src/acpica/source/components/dispatcher/dspkginit.c \
> + ../../src/acpica/source/components/dispatcher/dsutils.c \
> + ../../src/acpica/source/components/dispatcher/dswexec.c \
> + ../../src/acpica/source/components/dispatcher/dswload.c \
> + ../../src/acpica/source/components/dispatcher/dswscope.c \
> + ../../src/acpica/source/components/dispatcher/dswstate.c \
> + ../../src/acpica/source/components/dispatcher/dsargs.c \
> + ../../src/acpica/source/components/dispatcher/dswload2.c \
> + ../../src/acpica/source/components/dispatcher/dsopcode.c \
> + ../../src/acpica/source/components/events/evevent.c \
> + ../../src/acpica/source/components/events/evgpe.c \
> + ../../src/acpica/source/components/events/evgpeblk.c \
> + ../../src/acpica/source/components/events/evgpeinit.c \
> + ../../src/acpica/source/components/events/evgpeutil.c \
> + ../../src/acpica/source/components/events/evxfgpe.c \
> + ../../src/acpica/source/components/events/evmisc.c \
> + ../../src/acpica/source/components/events/evregion.c \
> + ../../src/acpica/source/components/events/evrgnini.c \
> + ../../src/acpica/source/components/events/evsci.c \
> + ../../src/acpica/source/components/events/evxface.c \
> + ../../src/acpica/source/components/events/evxfevnt.c \
> + ../../src/acpica/source/components/events/evxfregn.c \
> + ../../src/acpica/source/components/events/evglock.c \
> + ../../src/acpica/source/components/events/evhandler.c \
> + ../../src/acpica/source/components/executer/exconcat.c \
> + ../../src/acpica/source/components/executer/exfield.c \
> + ../../src/acpica/source/components/executer/exfldio.c \
> + ../../src/acpica/source/components/executer/exmisc.c \
> + ../../src/acpica/source/components/executer/exmutex.c \
> + ../../src/acpica/source/components/executer/exnames.c \
> + ../../src/acpica/source/components/executer/exoparg1.c \
> + ../../src/acpica/source/components/executer/exoparg2.c \
> + ../../src/acpica/source/components/executer/exoparg3.c \
> + ../../src/acpica/source/components/executer/exoparg6.c \
> + ../../src/acpica/source/components/executer/exprep.c \
> + ../../src/acpica/source/components/executer/exregion.c \
> + ../../src/acpica/source/components/executer/exresnte.c \
> + ../../src/acpica/source/components/executer/exresolv.c \
> + ../../src/acpica/source/components/executer/exresop.c \
> + ../../src/acpica/source/components/executer/exserial.c \
> + ../../src/acpica/source/components/executer/exstore.c \
> + ../../src/acpica/source/components/executer/exstoren.c \
> + ../../src/acpica/source/components/executer/exstorob.c \
> + ../../src/acpica/source/components/executer/exsystem.c \
> + ../../src/acpica/source/components/executer/extrace.c \
> + ../../src/acpica/source/components/executer/exutils.c \
> + ../../src/acpica/source/components/executer/exconvrt.c \
> + ../../src/acpica/source/components/executer/excreate.c \
> + ../../src/acpica/source/components/executer/exdump.c \
> + ../../src/acpica/source/components/executer/exdebug.c \
> + ../../src/acpica/source/components/executer/exconfig.c \
> + ../../src/acpica/source/components/hardware/hwacpi.c \
> + ../../src/acpica/source/components/hardware/hwgpe.c \
> + ../../src/acpica/source/components/hardware/hwpci.c \
> + ../../src/acpica/source/components/hardware/hwregs.c \
> + ../../src/acpica/source/components/hardware/hwsleep.c \
> + ../../src/acpica/source/components/hardware/hwvalid.c \
> + ../../src/acpica/source/components/hardware/hwxface.c \
> + ../../src/acpica/source/components/hardware/hwxfsleep.c \
> + ../../src/acpica/source/components/hardware/hwesleep.c \
> + ../../src/acpica/source/components/namespace/nsaccess.c \
> + ../../src/acpica/source/components/namespace/nsalloc.c \
> + ../../src/acpica/source/components/namespace/nsdump.c \
> + ../../src/acpica/source/components/namespace/nsdumpdv.c \
> + ../../src/acpica/source/components/namespace/nseval.c \
> + ../../src/acpica/source/components/namespace/nsinit.c \
> + ../../src/acpica/source/components/namespace/nsload.c \
> + ../../src/acpica/source/components/namespace/nsnames.c \
> + ../../src/acpica/source/components/namespace/nsobject.c \
> + ../../src/acpica/source/components/namespace/nsparse.c \
> + ../../src/acpica/source/components/namespace/nspredef.c \
> + ../../src/acpica/source/components/namespace/nsrepair.c \
> + ../../src/acpica/source/components/namespace/nsrepair2.c \
> + ../../src/acpica/source/components/namespace/nssearch.c \
> + ../../src/acpica/source/components/namespace/nsutils.c \
> + ../../src/acpica/source/components/namespace/nswalk.c \
> + ../../src/acpica/source/components/namespace/nsxfeval.c \
> + ../../src/acpica/source/components/namespace/nsxfname.c \
> + ../../src/acpica/source/components/namespace/nsxfobj.c \
> + ../../src/acpica/source/components/namespace/nsconvert.c \
> + ../../src/acpica/source/components/namespace/nsprepkg.c \
> + ../../src/acpica/source/components/namespace/nsarguments.c \
> + ../../src/acpica/source/components/parser/psargs.c \
> + ../../src/acpica/source/components/parser/psloop.c \
> + ../../src/acpica/source/components/parser/psopcode.c \
> + ../../src/acpica/source/components/parser/psparse.c \
> + ../../src/acpica/source/components/parser/psscope.c \
> + ../../src/acpica/source/components/parser/pstree.c \
> + ../../src/acpica/source/components/parser/psutils.c \
> + ../../src/acpica/source/components/parser/pswalk.c \
> + ../../src/acpica/source/components/parser/psxface.c \
> + ../../src/acpica/source/components/parser/psopinfo.c \
> + ../../src/acpica/source/components/parser/psobject.c \
> + ../../src/acpica/source/components/resources/rsaddr.c \
> + ../../src/acpica/source/components/resources/rscalc.c \
> + ../../src/acpica/source/components/resources/rscreate.c \
> + ../../src/acpica/source/components/resources/rsdump.c \
> + ../../src/acpica/source/components/resources/rsio.c \
> + ../../src/acpica/source/components/resources/rsinfo.c \
> + ../../src/acpica/source/components/resources/rsirq.c \
> + ../../src/acpica/source/components/resources/rslist.c \
> + ../../src/acpica/source/components/resources/rsmemory.c \
> + ../../src/acpica/source/components/resources/rsmisc.c \
> + ../../src/acpica/source/components/resources/rsutils.c \
> + ../../src/acpica/source/components/resources/rsxface.c \
> + ../../src/acpica/source/components/resources/rsserial.c \
> + ../../src/acpica/source/components/resources/rsdumpinfo.c \
> + ../../src/acpica/source/components/tables/tbdata.c \
> + ../../src/acpica/source/components/tables/tbfadt.c \
> + ../../src/acpica/source/components/tables/tbfind.c \
> + ../../src/acpica/source/components/tables/tbinstal.c \
> + ../../src/acpica/source/components/tables/tbutils.c \
> + ../../src/acpica/source/components/tables/tbxface.c \
> + ../../src/acpica/source/components/tables/tbxfroot.c \
> + ../../src/acpica/source/components/tables/tbxfload.c \
> + ../../src/acpica/source/components/tables/tbprint.c \
> + ../../src/acpica/source/components/utilities/utaddress.c \
> + ../../src/acpica/source/components/utilities/utalloc.c \
> + ../../src/acpica/source/components/utilities/utascii.c \
> + ../../src/acpica/source/components/utilities/utcache.c \
> + ../../src/acpica/source/components/utilities/utcopy.c \
> + ../../src/acpica/source/components/utilities/utdebug.c \
> + ../../src/acpica/source/components/utilities/utdelete.c \
> + ../../src/acpica/source/components/utilities/uteval.c \
> + ../../src/acpica/source/components/utilities/utglobal.c \
> + ../../src/acpica/source/components/utilities/uthex.c \
> + ../../src/acpica/source/components/utilities/utids.c \
> + ../../src/acpica/source/components/utilities/utinit.c \
> + ../../src/acpica/source/components/utilities/utlock.c \
> + ../../src/acpica/source/components/utilities/utmath.c \
> + ../../src/acpica/source/components/utilities/utmisc.c \
> + ../../src/acpica/source/components/utilities/utmutex.c \
> + ../../src/acpica/source/components/utilities/utnonansi.c \
> + ../../src/acpica/source/components/utilities/utobject.c \
> + ../../src/acpica/source/components/utilities/utresdecode.c \
> + ../../src/acpica/source/components/utilities/utresrc.c \
> + ../../src/acpica/source/components/utilities/utstate.c \
> + ../../src/acpica/source/components/utilities/utstrtoul64.c \
> + ../../src/acpica/source/components/utilities/uttrack.c \
> + ../../src/acpica/source/components/utilities/utosi.c \
> + ../../src/acpica/source/components/utilities/utxferror.c \
> + ../../src/acpica/source/components/utilities/utxface.c \
> + ../../src/acpica/source/components/utilities/utdecode.c \
> + ../../src/acpica/source/components/utilities/utexcep.c \
> + ../../src/acpica/source/components/utilities/utpredef.c \
> + ../../src/acpica/source/components/utilities/utstring.c \
> + ../../src/acpica/source/components/utilities/utstrsuppt.c \
> + ../../src/acpica/source/components/utilities/utownerid.c \
> + ../../src/acpica/source/components/utilities/utxfinit.c \
> + ../../src/acpica/source/components/utilities/uterror.c \
> + ../../src/acpica/source/components/utilities/utbuffer.c \
> + ../../src/acpica/source/components/utilities/utuuid.c \
> + ../../src/acpica/source/common/acfileio.c \
> + ../../src/acpica/source/common/acgetline.c \
> + ../../src/acpica/source/common/ahids.c \
> + ../../src/acpica/source/common/cmfsize.c \
> + ../../src/acpica/source/common/ahtable.c \
> + ../../src/acpica/source/common/ahuuids.c \
> + ../../src/acpica/source/tools/acpiexec/aeinitfile.c \
> + ../../src/acpica/source/tools/acpiexec/aehandlers.c \
> + ../../src/acpica/source/tools/acpiexec/aeexception.c \
> + ../../src/acpica/source/tools/acpiexec/aeregion.c \
> + ../../src/acpica/source/tools/acpiexec/aeinstall.c \
> + ../../src/acpica/source/os_specific/service_layers/osgendbg.c
>
> libfwtsacpica_la_LIBADD = \
> - -L$(top_builddir)/src/lib/src -lfwts -lrt
> + -L../../src/lib/src -lfwts -lrt
>
>
> --include $(top_srcdir)/git.mk
> +-include ../../git.mk
> diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am
> index c1d2aa62..328134cd 100644
> --- a/src/libfwtsiasl/Makefile.am
> +++ b/src/libfwtsiasl/Makefile.am
> @@ -26,8 +26,8 @@ AM_CPPFLAGS = -Wall -Wstrict-prototypes \
> -fno-strict-aliasing \
> -D_LINUX \
> -DACPI_ASL_COMPILER $(CFLAGS) \
> - -I$(srcdir)/../acpica/source/include \
> - -I$(srcdir)/../acpica/source/compiler
> + -I$(top_srcdir)/src/acpica/source/include \
> + -I$(top_srcdir)/src/acpica/source/compiler
>
> AM_YFLAGS = -d
>
> @@ -36,52 +36,52 @@ AM_YFLAGS = -d
> #
> AM_LFLAGS = -i
>
> -ASL_PARSER = \
> - $(srcdir)/../acpica/source/compiler/aslcstyle.y \
> - $(srcdir)/../acpica/source/compiler/aslhelpers.y \
> - $(srcdir)/../acpica/source/compiler/aslparser.y \
> - $(srcdir)/../acpica/source/compiler/aslprimaries.y \
> - $(srcdir)/../acpica/source/compiler/aslresources.y \
> - $(srcdir)/../acpica/source/compiler/aslrules.y \
> - $(srcdir)/../acpica/source/compiler/aslsupport.y \
> - $(srcdir)/../acpica/source/compiler/asltokens.y \
> - $(srcdir)/../acpica/source/compiler/asltypes.y
> +ASL_PARSER = \
> + ../../src/acpica/source/compiler/aslcstyle.y \
> + ../../src/acpica/source/compiler/aslhelpers.y \
> + ../../src/acpica/source/compiler/aslparser.y \
> + ../../src/acpica/source/compiler/aslprimaries.y \
> + ../../src/acpica/source/compiler/aslresources.y \
> + ../../src/acpica/source/compiler/aslrules.y \
> + ../../src/acpica/source/compiler/aslsupport.y \
> + ../../src/acpica/source/compiler/asltokens.y \
> + ../../src/acpica/source/compiler/asltypes.y
>
> ASL_LEXER =
> - $(srcdir)/../acpica/source/compiler/aslcompiler.l \
> - $(srcdir)/aslsupport.l \
> - $(srcdir)/aslcompiler.y.h
> + ../../src/acpica/source/compiler/aslcompiler.l \
> + aslsupport.l \
> + aslcompiler.y.h
>
> -$(srcdir)/aslcompiler.y: $(ASL_PARSER)
> - m4 -P -I$(srcdir)/../acpica/source/compiler $(srcdir)/../acpica/source/compiler/aslparser.y > $(srcdir)/aslcompiler.y
> +aslcompiler.y: $(ASL_PARSER)
> + m4 -P -I$(top_srcdir)/src/acpica/source/compiler $(top_srcdir)/src/acpica/source/compiler/aslparser.y > aslcompiler.y
>
> -$(srcdir)/aslcompilerlex.c: $(ASL_LEXER)
> - ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(srcdir)/../acpica/source/compiler/aslcompiler.l
> +aslcompilerlex.c: $(ASL_LEXER)
> + ${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l
>
> -.NOTPARALLEL: $(srcdir)/aslcompiler.c
> -$(srcdir)/aslcompiler.c $(srcdir)/aslcompiler.y.h: $(srcdir)/aslcompiler.y
> +.NOTPARALLEL: aslcompiler.c
> +aslcompiler.c aslcompiler.y.h: aslcompiler.y
> ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^
> mv aslcompiler.tab.c aslcompiler.c
> cp aslcompiler.tab.h aslcompiler.y.h
>
> -.NOTPARALLEL: $(srcdir)/dtcompilerparserlex.c
> -$(srcdir)/dtcompilerparserlex.c $(srcdir)/dtcompilerparser.c $(srcdir)/dtcompilerparser.y.h: $(srcdir)/../acpica/source/compiler/dtcompilerparser.l $(srcdir)/../acpica/source/compiler/dtcompilerparser.y
> - ${LEX} ${AM_LFLAGS} -PDtCompilerParser -o$(srcdir)/dtcompilerparserlex.c $<
> - ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(srcdir)/../acpica/source/compiler/dtcompilerparser.y
> +.NOTPARALLEL: dtcompilerparserlex.c
> +dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y
> + ${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $<
> + ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y
> mv dtcompilerparser.tab.c dtcompilerparser.c
> cp dtcompilerparser.tab.h dtcompilerparser.y.h
>
> -.NOTPARALLEL: $(srcdir)/dtparserlex.c
> -$(srcdir)/dtparserlex.c $(srcdir)/dtparser.c $(srcdir)/dtparser.y.h: $(srcdir)/../acpica/source/compiler/dtparser.l $(srcdir)/../acpica/source/compiler/dtparser.y
> - ${LEX} ${AM_LFLAGS} -PDtParser -o$(srcdir)/dtparserlex.c $<
> - ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(srcdir)/../acpica/source/compiler/dtparser.y
> +.NOTPARALLEL: dtparserlex.c
> +dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y
> + ${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $<
> + ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y
> mv dtparser.tab.c dtparser.c
> cp dtparser.tab.h dtparser.y.h
>
> -.NOTPARALLEL: $(srcdir)/prparserlex.c
> -$(srcdir)/prparserlex.c $(srcdir)/prparser.c $(srcdir)/prparser.y.h: $(srcdir)/../acpica/source/compiler/prparser.l $(srcdir)/../acpica/source/compiler/prparser.y
> - ${LEX} ${AM_LFLAGS} -PPrParser -o$(srcdir)/prparserlex.c $<
> - ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(srcdir)/../acpica/source/compiler/prparser.y
> +.NOTPARALLEL: prparserlex.c
> +prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y
> + ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $<
> + ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y
> mv prparser.tab.c prparser.c
> cp prparser.tab.h prparser.y.h
>
> @@ -119,206 +119,206 @@ libfwtsiasl_la_SOURCES = \
> dtparser.c \
> prparserlex.c \
> prparser.c \
> - $(srcdir)/../acpica/source/common/adisasm.c \
> - $(srcdir)/../acpica/source/common/acfileio.c \
> - $(srcdir)/../acpica/source/common/adfile.c \
> - $(srcdir)/../acpica/source/common/adwalk.c \
> - $(srcdir)/../acpica/source/common/ahids.c \
> - $(srcdir)/../acpica/source/common/ahpredef.c \
> - $(srcdir)/../acpica/source/common/ahtable.c \
> - $(srcdir)/../acpica/source/common/ahuuids.c \
> - $(srcdir)/../acpica/source/compiler/aslallocate.c \
> - $(srcdir)/../acpica/source/compiler/aslanalyze.c \
> - $(srcdir)/../acpica/source/compiler/aslascii.c \
> - $(srcdir)/../acpica/source/compiler/aslbtypes.c \
> - $(srcdir)/../acpica/source/compiler/aslcache.c \
> - $(srcdir)/../acpica/source/compiler/aslcodegen.c \
> - $(srcdir)/../acpica/source/compiler/aslcompile.c \
> - $(srcdir)/../acpica/source/compiler/asldebug.c \
> - $(srcdir)/../acpica/source/compiler/aslerror.c \
> - $(srcdir)/../acpica/source/compiler/aslexternal.c \
> - $(srcdir)/../acpica/source/compiler/aslfiles.c \
> - $(srcdir)/../acpica/source/compiler/aslfileio.c \
> - $(srcdir)/../acpica/source/compiler/aslfold.c \
> - $(srcdir)/../acpica/source/compiler/aslhelp.c \
> - $(srcdir)/../acpica/source/compiler/aslhex.c \
> - $(srcdir)/../acpica/source/compiler/asllength.c \
> - $(srcdir)/../acpica/source/compiler/asllisting.c \
> - $(srcdir)/../acpica/source/compiler/asllistsup.c \
> - $(srcdir)/../acpica/source/compiler/aslload.c \
> - $(srcdir)/../acpica/source/compiler/asllookup.c \
> - $(srcdir)/../acpica/source/compiler/aslmain.c \
> - $(srcdir)/../acpica/source/compiler/aslmap.c \
> - $(srcdir)/../acpica/source/compiler/aslmapenter.c \
> - $(srcdir)/../acpica/source/compiler/aslmapoutput.c \
> - $(srcdir)/../acpica/source/compiler/aslmaputils.c \
> - $(srcdir)/../acpica/source/compiler/aslmessages.c \
> - $(srcdir)/../acpica/source/compiler/aslmethod.c \
> - $(srcdir)/../acpica/source/compiler/aslnamesp.c \
> - $(srcdir)/../acpica/source/compiler/asloffset.c \
> - $(srcdir)/../acpica/source/compiler/aslopcodes.c \
> - $(srcdir)/../acpica/source/compiler/asloperands.c \
> - $(srcdir)/../acpica/source/compiler/aslopt.c \
> - $(srcdir)/../acpica/source/compiler/asloptions.c \
> - $(srcdir)/../acpica/source/compiler/aslparseop.c \
> - $(srcdir)/../acpica/source/compiler/aslpredef.c \
> - $(srcdir)/../acpica/source/compiler/aslprepkg.c \
> - $(srcdir)/../acpica/source/compiler/aslprintf.c \
> - $(srcdir)/../acpica/source/compiler/aslprune.c \
> - $(srcdir)/../acpica/source/compiler/aslresource.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype1.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype1i.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2d.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2e.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2q.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2s.c \
> - $(srcdir)/../acpica/source/compiler/aslrestype2w.c \
> - $(srcdir)/../acpica/source/compiler/aslstartup.c \
> - $(srcdir)/../acpica/source/compiler/aslstubs.c \
> - $(srcdir)/../acpica/source/compiler/aslpld.c \
> - $(srcdir)/../acpica/source/compiler/asltransform.c \
> - $(srcdir)/../acpica/source/compiler/asltree.c \
> - $(srcdir)/../acpica/source/compiler/aslutils.c \
> - $(srcdir)/../acpica/source/compiler/asluuid.c \
> - $(srcdir)/../acpica/source/compiler/aslwalks.c \
> - $(srcdir)/../acpica/source/compiler/aslxref.c \
> - $(srcdir)/../acpica/source/compiler/aslxrefout.c \
> - $(srcdir)/../acpica/source/compiler/cvcompiler.c \
> - $(srcdir)/../acpica/source/compiler/cvdisasm.c \
> - $(srcdir)/../acpica/source/compiler/cvparser.c \
> - $(srcdir)/../acpica/source/common/cmfsize.c \
> - $(srcdir)/../acpica/source/components/debugger/dbfileio.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmbuffer.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmcstyle.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmdeferred.c \
> - $(srcdir)/../acpica/source/common/dmextern.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmnames.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmopcode.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrc.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcl.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcl2.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmresrcs.c \
> - $(srcdir)/../acpica/source/common/dmrestag.c \
> - $(srcdir)/../acpica/source/common/dmswitch.c \
> - $(srcdir)/../acpica/source/common/dmtable.c \
> - $(srcdir)/../acpica/source/common/dmtables.c \
> - $(srcdir)/../acpica/source/common/dmtbdump.c \
> - $(srcdir)/../acpica/source/common/dmtbdump1.c \
> - $(srcdir)/../acpica/source/common/dmtbdump2.c \
> - $(srcdir)/../acpica/source/common/dmtbdump3.c \
> - $(srcdir)/../acpica/source/common/dmtbinfo.c \
> - $(srcdir)/../acpica/source/common/dmtbinfo1.c \
> - $(srcdir)/../acpica/source/common/dmtbinfo2.c \
> - $(srcdir)/../acpica/source/common/dmtbinfo3.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmutils.c \
> - $(srcdir)/../acpica/source/components/disassembler/dmwalk.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsargs.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dscontrol.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsfield.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsobject.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsopcode.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dspkginit.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dsutils.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswexec.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswload.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswload2.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswscope.c \
> - $(srcdir)/../acpica/source/components/dispatcher/dswstate.c \
> - $(srcdir)/../acpica/source/compiler/dtcompile.c \
> - $(srcdir)/../acpica/source/compiler/dtexpress.c \
> - $(srcdir)/../acpica/source/compiler/dtfield.c \
> - $(srcdir)/../acpica/source/compiler/dtio.c \
> - $(srcdir)/../acpica/source/compiler/dtsubtable.c \
> - $(srcdir)/../acpica/source/compiler/dttable.c \
> - $(srcdir)/../acpica/source/compiler/dttable1.c \
> - $(srcdir)/../acpica/source/compiler/dttable2.c \
> - $(srcdir)/../acpica/source/compiler/dttemplate.c \
> - $(srcdir)/../acpica/source/compiler/dtutils.c \
> - $(srcdir)/../acpica/source/components/executer/exconcat.c \
> - $(srcdir)/../acpica/source/components/executer/exconvrt.c \
> - $(srcdir)/../acpica/source/components/executer/excreate.c \
> - $(srcdir)/../acpica/source/components/executer/exdump.c \
> - $(srcdir)/../acpica/source/components/executer/exmisc.c \
> - $(srcdir)/../acpica/source/components/executer/exmutex.c \
> - $(srcdir)/../acpica/source/components/executer/exnames.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg1.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg2.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg3.c \
> - $(srcdir)/../acpica/source/components/executer/exoparg6.c \
> - $(srcdir)/../acpica/source/components/executer/exprep.c \
> - $(srcdir)/../acpica/source/components/executer/exregion.c \
> - $(srcdir)/../acpica/source/components/executer/exresnte.c \
> - $(srcdir)/../acpica/source/components/executer/exresolv.c \
> - $(srcdir)/../acpica/source/components/executer/exresop.c \
> - $(srcdir)/../acpica/source/components/executer/exstore.c \
> - $(srcdir)/../acpica/source/components/executer/exstoren.c \
> - $(srcdir)/../acpica/source/components/executer/exstorob.c \
> - $(srcdir)/../acpica/source/components/executer/exsystem.c \
> - $(srcdir)/../acpica/source/components/executer/exutils.c \
> - $(srcdir)/../acpica/source/common/getopt.c \
> - $(srcdir)/../acpica/source/components/namespace/nsaccess.c \
> - $(srcdir)/../acpica/source/components/namespace/nsalloc.c \
> - $(srcdir)/../acpica/source/components/namespace/nsdump.c \
> - $(srcdir)/../acpica/source/components/namespace/nsnames.c \
> - $(srcdir)/../acpica/source/components/namespace/nsobject.c \
> - $(srcdir)/../acpica/source/components/namespace/nsparse.c \
> - $(srcdir)/../acpica/source/components/namespace/nssearch.c \
> - $(srcdir)/../acpica/source/components/namespace/nsutils.c \
> - $(srcdir)/../acpica/source/components/namespace/nswalk.c \
> - $(srcdir)/../acpica/source/components/namespace/nsxfobj.c \
> - $(srcdir)/../acpica/source/os_specific/service_layers/osunixxf.c\
> - $(srcdir)/../acpica/source/compiler/prexpress.c \
> - $(srcdir)/../acpica/source/compiler/prmacros.c \
> - $(srcdir)/../acpica/source/compiler/prscan.c \
> - $(srcdir)/../acpica/source/compiler/prutils.c \
> - $(srcdir)/../acpica/source/components/parser/psargs.c \
> - $(srcdir)/../acpica/source/components/parser/psloop.c \
> - $(srcdir)/../acpica/source/components/parser/psobject.c \
> - $(srcdir)/../acpica/source/components/parser/psopcode.c \
> - $(srcdir)/../acpica/source/components/parser/psopinfo.c \
> - $(srcdir)/../acpica/source/components/parser/psparse.c \
> - $(srcdir)/../acpica/source/components/parser/psscope.c \
> - $(srcdir)/../acpica/source/components/parser/pstree.c \
> - $(srcdir)/../acpica/source/components/parser/psutils.c \
> - $(srcdir)/../acpica/source/components/parser/pswalk.c \
> - $(srcdir)/../acpica/source/components/tables/tbdata.c \
> - $(srcdir)/../acpica/source/components/tables/tbfadt.c \
> - $(srcdir)/../acpica/source/components/tables/tbinstal.c \
> - $(srcdir)/../acpica/source/components/tables/tbprint.c \
> - $(srcdir)/../acpica/source/components/tables/tbutils.c \
> - $(srcdir)/../acpica/source/components/tables/tbxface.c \
> - $(srcdir)/../acpica/source/components/tables/tbxfload.c \
> - $(srcdir)/../acpica/source/components/utilities/utaddress.c \
> - $(srcdir)/../acpica/source/components/utilities/utalloc.c \
> - $(srcdir)/../acpica/source/components/utilities/utascii.c \
> - $(srcdir)/../acpica/source/components/utilities/utbuffer.c \
> - $(srcdir)/../acpica/source/components/utilities/utcache.c \
> - $(srcdir)/../acpica/source/components/utilities/utcopy.c \
> - $(srcdir)/../acpica/source/components/utilities/utdebug.c \
> - $(srcdir)/../acpica/source/components/utilities/utdecode.c \
> - $(srcdir)/../acpica/source/components/utilities/utdelete.c \
> - $(srcdir)/../acpica/source/components/utilities/uterror.c \
> - $(srcdir)/../acpica/source/components/utilities/utexcep.c \
> - $(srcdir)/../acpica/source/components/utilities/utglobal.c \
> - $(srcdir)/../acpica/source/components/utilities/uthex.c \
> - $(srcdir)/../acpica/source/components/utilities/utinit.c \
> - $(srcdir)/../acpica/source/components/utilities/utlock.c \
> - $(srcdir)/../acpica/source/components/utilities/utmath.c \
> - $(srcdir)/../acpica/source/components/utilities/utmisc.c \
> - $(srcdir)/../acpica/source/components/utilities/utmutex.c \
> - $(srcdir)/../acpica/source/components/utilities/utnonansi.c \
> - $(srcdir)/../acpica/source/components/utilities/utobject.c \
> - $(srcdir)/../acpica/source/components/utilities/utownerid.c \
> - $(srcdir)/../acpica/source/components/utilities/utpredef.c \
> - $(srcdir)/../acpica/source/components/utilities/utresdecode.c \
> - $(srcdir)/../acpica/source/components/utilities/utresrc.c \
> - $(srcdir)/../acpica/source/components/utilities/utstate.c \
> - $(srcdir)/../acpica/source/components/utilities/utstrtoul64.c \
> - $(srcdir)/../acpica/source/components/utilities/utstrsuppt.c \
> - $(srcdir)/../acpica/source/components/utilities/utstring.c \
> - $(srcdir)/../acpica/source/components/utilities/utuuid.c \
> - $(srcdir)/../acpica/source/components/utilities/utxface.c \
> - $(srcdir)/../acpica/source/components/utilities/utxferror.c
> + ../../src/acpica/source/common/adisasm.c \
> + ../../src/acpica/source/common/acfileio.c \
> + ../../src/acpica/source/common/adfile.c \
> + ../../src/acpica/source/common/adwalk.c \
> + ../../src/acpica/source/common/ahids.c \
> + ../../src/acpica/source/common/ahpredef.c \
> + ../../src/acpica/source/common/ahtable.c \
> + ../../src/acpica/source/common/ahuuids.c \
> + ../../src/acpica/source/compiler/aslallocate.c \
> + ../../src/acpica/source/compiler/aslanalyze.c \
> + ../../src/acpica/source/compiler/aslascii.c \
> + ../../src/acpica/source/compiler/aslbtypes.c \
> + ../../src/acpica/source/compiler/aslcache.c \
> + ../../src/acpica/source/compiler/aslcodegen.c \
> + ../../src/acpica/source/compiler/aslcompile.c \
> + ../../src/acpica/source/compiler/asldebug.c \
> + ../../src/acpica/source/compiler/aslerror.c \
> + ../../src/acpica/source/compiler/aslexternal.c \
> + ../../src/acpica/source/compiler/aslfiles.c \
> + ../../src/acpica/source/compiler/aslfileio.c \
> + ../../src/acpica/source/compiler/aslfold.c \
> + ../../src/acpica/source/compiler/aslhelp.c \
> + ../../src/acpica/source/compiler/aslhex.c \
> + ../../src/acpica/source/compiler/asllength.c \
> + ../../src/acpica/source/compiler/asllisting.c \
> + ../../src/acpica/source/compiler/asllistsup.c \
> + ../../src/acpica/source/compiler/aslload.c \
> + ../../src/acpica/source/compiler/asllookup.c \
> + ../../src/acpica/source/compiler/aslmain.c \
> + ../../src/acpica/source/compiler/aslmap.c \
> + ../../src/acpica/source/compiler/aslmapenter.c \
> + ../../src/acpica/source/compiler/aslmapoutput.c \
> + ../../src/acpica/source/compiler/aslmaputils.c \
> + ../../src/acpica/source/compiler/aslmessages.c \
> + ../../src/acpica/source/compiler/aslmethod.c \
> + ../../src/acpica/source/compiler/aslnamesp.c \
> + ../../src/acpica/source/compiler/asloffset.c \
> + ../../src/acpica/source/compiler/aslopcodes.c \
> + ../../src/acpica/source/compiler/asloperands.c \
> + ../../src/acpica/source/compiler/aslopt.c \
> + ../../src/acpica/source/compiler/asloptions.c \
> + ../../src/acpica/source/compiler/aslparseop.c \
> + ../../src/acpica/source/compiler/aslpredef.c \
> + ../../src/acpica/source/compiler/aslprepkg.c \
> + ../../src/acpica/source/compiler/aslprintf.c \
> + ../../src/acpica/source/compiler/aslprune.c \
> + ../../src/acpica/source/compiler/aslresource.c \
> + ../../src/acpica/source/compiler/aslrestype1.c \
> + ../../src/acpica/source/compiler/aslrestype1i.c \
> + ../../src/acpica/source/compiler/aslrestype2.c \
> + ../../src/acpica/source/compiler/aslrestype2d.c \
> + ../../src/acpica/source/compiler/aslrestype2e.c \
> + ../../src/acpica/source/compiler/aslrestype2q.c \
> + ../../src/acpica/source/compiler/aslrestype2s.c \
> + ../../src/acpica/source/compiler/aslrestype2w.c \
> + ../../src/acpica/source/compiler/aslstartup.c \
> + ../../src/acpica/source/compiler/aslstubs.c \
> + ../../src/acpica/source/compiler/aslpld.c \
> + ../../src/acpica/source/compiler/asltransform.c \
> + ../../src/acpica/source/compiler/asltree.c \
> + ../../src/acpica/source/compiler/aslutils.c \
> + ../../src/acpica/source/compiler/asluuid.c \
> + ../../src/acpica/source/compiler/aslwalks.c \
> + ../../src/acpica/source/compiler/aslxref.c \
> + ../../src/acpica/source/compiler/aslxrefout.c \
> + ../../src/acpica/source/compiler/cvcompiler.c \
> + ../../src/acpica/source/compiler/cvdisasm.c \
> + ../../src/acpica/source/compiler/cvparser.c \
> + ../../src/acpica/source/common/cmfsize.c \
> + ../../src/acpica/source/components/debugger/dbfileio.c \
> + ../../src/acpica/source/components/disassembler/dmbuffer.c \
> + ../../src/acpica/source/components/disassembler/dmcstyle.c \
> + ../../src/acpica/source/components/disassembler/dmdeferred.c \
> + ../../src/acpica/source/common/dmextern.c \
> + ../../src/acpica/source/components/disassembler/dmnames.c \
> + ../../src/acpica/source/components/disassembler/dmopcode.c \
> + ../../src/acpica/source/components/disassembler/dmresrc.c \
> + ../../src/acpica/source/components/disassembler/dmresrcl.c \
> + ../../src/acpica/source/components/disassembler/dmresrcl2.c \
> + ../../src/acpica/source/components/disassembler/dmresrcs.c \
> + ../../src/acpica/source/common/dmrestag.c \
> + ../../src/acpica/source/common/dmswitch.c \
> + ../../src/acpica/source/common/dmtable.c \
> + ../../src/acpica/source/common/dmtables.c \
> + ../../src/acpica/source/common/dmtbdump.c \
> + ../../src/acpica/source/common/dmtbdump1.c \
> + ../../src/acpica/source/common/dmtbdump2.c \
> + ../../src/acpica/source/common/dmtbdump3.c \
> + ../../src/acpica/source/common/dmtbinfo.c \
> + ../../src/acpica/source/common/dmtbinfo1.c \
> + ../../src/acpica/source/common/dmtbinfo2.c \
> + ../../src/acpica/source/common/dmtbinfo3.c \
> + ../../src/acpica/source/components/disassembler/dmutils.c \
> + ../../src/acpica/source/components/disassembler/dmwalk.c \
> + ../../src/acpica/source/components/dispatcher/dsargs.c \
> + ../../src/acpica/source/components/dispatcher/dscontrol.c \
> + ../../src/acpica/source/components/dispatcher/dsfield.c \
> + ../../src/acpica/source/components/dispatcher/dsobject.c \
> + ../../src/acpica/source/components/dispatcher/dsopcode.c \
> + ../../src/acpica/source/components/dispatcher/dspkginit.c \
> + ../../src/acpica/source/components/dispatcher/dsutils.c \
> + ../../src/acpica/source/components/dispatcher/dswexec.c \
> + ../../src/acpica/source/components/dispatcher/dswload.c \
> + ../../src/acpica/source/components/dispatcher/dswload2.c \
> + ../../src/acpica/source/components/dispatcher/dswscope.c \
> + ../../src/acpica/source/components/dispatcher/dswstate.c \
> + ../../src/acpica/source/compiler/dtcompile.c \
> + ../../src/acpica/source/compiler/dtexpress.c \
> + ../../src/acpica/source/compiler/dtfield.c \
> + ../../src/acpica/source/compiler/dtio.c \
> + ../../src/acpica/source/compiler/dtsubtable.c \
> + ../../src/acpica/source/compiler/dttable.c \
> + ../../src/acpica/source/compiler/dttable1.c \
> + ../../src/acpica/source/compiler/dttable2.c \
> + ../../src/acpica/source/compiler/dttemplate.c \
> + ../../src/acpica/source/compiler/dtutils.c \
> + ../../src/acpica/source/components/executer/exconcat.c \
> + ../../src/acpica/source/components/executer/exconvrt.c \
> + ../../src/acpica/source/components/executer/excreate.c \
> + ../../src/acpica/source/components/executer/exdump.c \
> + ../../src/acpica/source/components/executer/exmisc.c \
> + ../../src/acpica/source/components/executer/exmutex.c \
> + ../../src/acpica/source/components/executer/exnames.c \
> + ../../src/acpica/source/components/executer/exoparg1.c \
> + ../../src/acpica/source/components/executer/exoparg2.c \
> + ../../src/acpica/source/components/executer/exoparg3.c \
> + ../../src/acpica/source/components/executer/exoparg6.c \
> + ../../src/acpica/source/components/executer/exprep.c \
> + ../../src/acpica/source/components/executer/exregion.c \
> + ../../src/acpica/source/components/executer/exresnte.c \
> + ../../src/acpica/source/components/executer/exresolv.c \
> + ../../src/acpica/source/components/executer/exresop.c \
> + ../../src/acpica/source/components/executer/exstore.c \
> + ../../src/acpica/source/components/executer/exstoren.c \
> + ../../src/acpica/source/components/executer/exstorob.c \
> + ../../src/acpica/source/components/executer/exsystem.c \
> + ../../src/acpica/source/components/executer/exutils.c \
> + ../../src/acpica/source/common/getopt.c \
> + ../../src/acpica/source/components/namespace/nsaccess.c \
> + ../../src/acpica/source/components/namespace/nsalloc.c \
> + ../../src/acpica/source/components/namespace/nsdump.c \
> + ../../src/acpica/source/components/namespace/nsnames.c \
> + ../../src/acpica/source/components/namespace/nsobject.c \
> + ../../src/acpica/source/components/namespace/nsparse.c \
> + ../../src/acpica/source/components/namespace/nssearch.c \
> + ../../src/acpica/source/components/namespace/nsutils.c \
> + ../../src/acpica/source/components/namespace/nswalk.c \
> + ../../src/acpica/source/components/namespace/nsxfobj.c \
> + ../../src/acpica/source/os_specific/service_layers/osunixxf.c \
> + ../../src/acpica/source/compiler/prexpress.c \
> + ../../src/acpica/source/compiler/prmacros.c \
> + ../../src/acpica/source/compiler/prscan.c \
> + ../../src/acpica/source/compiler/prutils.c \
> + ../../src/acpica/source/components/parser/psargs.c \
> + ../../src/acpica/source/components/parser/psloop.c \
> + ../../src/acpica/source/components/parser/psobject.c \
> + ../../src/acpica/source/components/parser/psopcode.c \
> + ../../src/acpica/source/components/parser/psopinfo.c \
> + ../../src/acpica/source/components/parser/psparse.c \
> + ../../src/acpica/source/components/parser/psscope.c \
> + ../../src/acpica/source/components/parser/pstree.c \
> + ../../src/acpica/source/components/parser/psutils.c \
> + ../../src/acpica/source/components/parser/pswalk.c \
> + ../../src/acpica/source/components/tables/tbdata.c \
> + ../../src/acpica/source/components/tables/tbfadt.c \
> + ../../src/acpica/source/components/tables/tbinstal.c \
> + ../../src/acpica/source/components/tables/tbprint.c \
> + ../../src/acpica/source/components/tables/tbutils.c \
> + ../../src/acpica/source/components/tables/tbxface.c \
> + ../../src/acpica/source/components/tables/tbxfload.c \
> + ../../src/acpica/source/components/utilities/utaddress.c \
> + ../../src/acpica/source/components/utilities/utalloc.c \
> + ../../src/acpica/source/components/utilities/utascii.c \
> + ../../src/acpica/source/components/utilities/utbuffer.c \
> + ../../src/acpica/source/components/utilities/utcache.c \
> + ../../src/acpica/source/components/utilities/utcopy.c \
> + ../../src/acpica/source/components/utilities/utdebug.c \
> + ../../src/acpica/source/components/utilities/utdecode.c \
> + ../../src/acpica/source/components/utilities/utdelete.c \
> + ../../src/acpica/source/components/utilities/uterror.c \
> + ../../src/acpica/source/components/utilities/utexcep.c \
> + ../../src/acpica/source/components/utilities/utglobal.c \
> + ../../src/acpica/source/components/utilities/uthex.c \
> + ../../src/acpica/source/components/utilities/utinit.c \
> + ../../src/acpica/source/components/utilities/utlock.c \
> + ../../src/acpica/source/components/utilities/utmath.c \
> + ../../src/acpica/source/components/utilities/utmisc.c \
> + ../../src/acpica/source/components/utilities/utmutex.c \
> + ../../src/acpica/source/components/utilities/utnonansi.c \
> + ../../src/acpica/source/components/utilities/utobject.c \
> + ../../src/acpica/source/components/utilities/utownerid.c \
> + ../../src/acpica/source/components/utilities/utpredef.c \
> + ../../src/acpica/source/components/utilities/utresdecode.c \
> + ../../src/acpica/source/components/utilities/utresrc.c \
> + ../../src/acpica/source/components/utilities/utstate.c \
> + ../../src/acpica/source/components/utilities/utstrtoul64.c \
> + ../../src/acpica/source/components/utilities/utstrsuppt.c \
> + ../../src/acpica/source/components/utilities/utstring.c \
> + ../../src/acpica/source/components/utilities/utuuid.c \
> + ../../src/acpica/source/components/utilities/utxface.c \
> + ../../src/acpica/source/components/utilities/utxferror.c
>
> --include $(top_srcdir)/git.mk
> +-include ../../git.mk
> diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
> index 1fc0fc02..a7d9b9c5 100644
> --- a/src/utilities/Makefile.am
> +++ b/src/utilities/Makefile.am
> @@ -20,7 +20,7 @@ AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
> -I$(srcdir)/../lib/include
>
> bin_PROGRAMS = kernelscan
> -kernelscan_SOURCES = kernelscan.c $(srcdir)/../lib/src/fwts_json.c
> +kernelscan_SOURCES = kernelscan.c ../../src/lib/src/fwts_json.c
>
>
> -include $(top_srcdir)/git.mk
>
Acked-by: Alex Hung <alex.hung at canonical.com>
More information about the fwts-devel
mailing list