Patchwork src/Makefile.am: Tidy up fwts main makefile, re-order tests

login
register
mail settings
Submitter Colin King
Date Dec. 13, 2012, 3:25 p.m.
Message ID <1355412330-32461-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/206118/
State Accepted
Headers show

Comments

Colin King - Dec. 13, 2012, 3:25 p.m.
From: Colin Ian King <colin.king@canonical.com>

Minor tidy-up of the makefile.  I've re-ordered the tests based on
category and test name alphabetical order to make it easier to find
and add tests in the future.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/Makefile.am | 128 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 69 insertions(+), 59 deletions(-)
Keng-Yu Lin - Dec. 18, 2012, 2:58 a.m.
On Thu, Dec 13, 2012 at 11:25 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Minor tidy-up of the makefile.  I've re-ordered the tests based on
> category and test name alphabetical order to make it easier to find
> and add tests in the future.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/Makefile.am | 128 ++++++++++++++++++++++++++++++--------------------------
>  1 file changed, 69 insertions(+), 59 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 116b62f..31324c8 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -6,67 +6,77 @@
>  # but libfwts.so depends on libraries produced by acpica/source/compiler.
>  SUBDIRS = acpica/source/compiler lib acpica
>
> -AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -I$(top_srcdir)/efi_runtime -Wall -Werror -Wextra
> +AM_CPPFLAGS = \
> +       -I$(top_srcdir)/src/lib/include \
> +       -I$(top_srcdir)/src/acpica/source/include \
> +       -I$(top_srcdir)/efi_runtime \
> +       -Wall -Werror -Wextra
>
>  bin_PROGRAMS = fwts
> -fwts_SOURCES = main.c \
> -       acpi/klog/klog.c \
> -       acpi/wakealarm/wakealarm.c \
> -       acpi/syntaxcheck/syntaxcheck.c \
> -       acpi/s3/s3.c \
> -       acpi/s3power/s3power.c \
> -       acpi/s4/s4.c \
> -       acpi/ac_adapter/ac_adapter.c \
> -       acpi/acpiinfo/acpiinfo.c \
> -       acpi/acpidump/acpidump.c \
> -       acpi/acpitables/acpitables.c \
> -       acpi/apicinstance/apicinstance.c \
> -       acpi/battery/battery.c \
> -       acpi/brightness/brightness.c \
> -       acpi/checksum/checksum.c \
> -       acpi/cstates/cstates.c \
> -       acpi/dmar/dmar.c \
> -       acpi/fadt/fadt.c \
> -       acpi/fan/fan.c \
> -       acpi/mcfg/mcfg.c \
> -       acpi/method/method.c \
> -       apic/apicedge/apicedge.c \
> -       acpi/osilinux/osilinux.c \
> -       acpi/lid/lid.c \
> -       acpi/powerbutton/powerbutton.c \
> -       acpi/wmi/wmi.c \
> -       acpi/pcc/pcc.c \
> -       bios/ebda_region/ebda_region.c \
> -       bios/ebdadump/ebdadump.c \
> -       bios/mtrr/mtrr.c \
> -       bios/bios_info/bios_info.c \
> -       bios/bios32/bios32.c \
> -       bios/hdaaudio/hdaaudio.c \
> -       bios/romdump/romdump.c \
> -       bios/os2gap/os2gap.c \
> -       bios/memmapdump/memmapdump.c \
> -       bios/multiproc/mpdump.c \
> -       bios/multiproc/mpcheck.c \
> -       bios/pciirq/pciirq.c \
> -       bios/pnp/pnp.c \
> -       bios/smbios/smbios.c \
> -       cmos/cmosdump/cmosdump.c \
> -       dmi/dmi_decode/dmi_decode.c \
> -       hpet/hpet_check/hpet_check.c \
> -       pci/aspm/aspm.c \
> -       pci/crs/crs.c \
> -       pci/maxreadreq/maxreadreq.c \
> -       cpu/virt/virt.c cpu/virt/virt_svm.c cpu/virt/virt_vmx.c \
> -       cpu/maxfreq/maxfreq.c \
> -       cpu/cpufreq/cpufreq.c \
> -       cpu/nx/nx.c \
> -       cpu/msr/msr.c \
> -       cpu/microcode/microcode.c \
> -       hotkey/hotkey/hotkey.c \
> -       kernel/version/version.c \
> -       kernel/oops/oops.c \
> -       uefi/csm/csm.c \
> -       uefi/uefidump/uefidump.c \
> +
> +#
> +#  fwts main + tests
> +#
> +fwts_SOURCES = main.c                          \
> +       acpi/ac_adapter/ac_adapter.c            \
> +       acpi/acpidump/acpidump.c                \
> +       acpi/acpiinfo/acpiinfo.c                \
> +       acpi/acpitables/acpitables.c            \
> +       apic/apicedge/apicedge.c                \
> +       acpi/apicinstance/apicinstance.c        \
> +       acpi/battery/battery.c                  \
> +       acpi/brightness/brightness.c            \
> +       acpi/checksum/checksum.c                \
> +       acpi/cstates/cstates.c                  \
> +       acpi/dmar/dmar.c                        \
> +       acpi/fadt/fadt.c                        \
> +       acpi/fan/fan.c                          \
> +       acpi/klog/klog.c                        \
> +       acpi/lid/lid.c                          \
> +       acpi/mcfg/mcfg.c                        \
> +       acpi/method/method.c                    \
> +       acpi/osilinux/osilinux.c                \
> +       acpi/pcc/pcc.c                          \
> +       acpi/powerbutton/powerbutton.c          \
> +       acpi/s3/s3.c                            \
> +       acpi/s3power/s3power.c                  \
> +       acpi/s4/s4.c                            \
> +       acpi/syntaxcheck/syntaxcheck.c          \
> +       acpi/wakealarm/wakealarm.c              \
> +       acpi/wmi/wmi.c                          \
> +       bios/bios_info/bios_info.c              \
> +       bios/bios32/bios32.c                    \
> +       bios/ebda_region/ebda_region.c          \
> +       bios/ebdadump/ebdadump.c                \
> +       bios/hdaaudio/hdaaudio.c                \
> +       bios/memmapdump/memmapdump.c            \
> +       bios/mtrr/mtrr.c                        \
> +       bios/multiproc/mpcheck.c                \
> +       bios/multiproc/mpdump.c                 \
> +       bios/os2gap/os2gap.c                    \
> +       bios/pciirq/pciirq.c                    \
> +       bios/pnp/pnp.c                          \
> +       bios/romdump/romdump.c                  \
> +       bios/smbios/smbios.c                    \
> +       cmos/cmosdump/cmosdump.c                \
> +       cpu/virt/virt.c                         \
> +       cpu/virt/virt_svm.c                     \
> +       cpu/virt/virt_vmx.c                     \
> +       cpu/maxfreq/maxfreq.c                   \
> +       cpu/cpufreq/cpufreq.c                   \
> +       cpu/nx/nx.c                             \
> +       cpu/msr/msr.c                           \
> +       cpu/microcode/microcode.c               \
> +       dmi/dmi_decode/dmi_decode.c             \
> +       hotkey/hotkey/hotkey.c                  \
> +       hpet/hpet_check/hpet_check.c            \
> +       kernel/oops/oops.c                      \
> +       kernel/version/version.c                \
> +       pci/aspm/aspm.c                         \
> +       pci/crs/crs.c                           \
> +       pci/maxreadreq/maxreadreq.c             \
> +       uefi/csm/csm.c                          \
> +       uefi/uefidump/uefidump.c                \
>         uefi/uefirttime/uefirttime.c
>
>  fwts_LDFLAGS = -ljson -lm
> --
> 1.8.0
>
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Ivan Hu - Dec. 20, 2012, 3:55 a.m.
On 12/13/2012 11:25 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Minor tidy-up of the makefile.  I've re-ordered the tests based on
> category and test name alphabetical order to make it easier to find
> and add tests in the future.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/Makefile.am | 128 ++++++++++++++++++++++++++++++--------------------------
>   1 file changed, 69 insertions(+), 59 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 116b62f..31324c8 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -6,67 +6,77 @@
>   # but libfwts.so depends on libraries produced by acpica/source/compiler.
>   SUBDIRS = acpica/source/compiler lib acpica
>
> -AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -I$(top_srcdir)/efi_runtime -Wall -Werror -Wextra
> +AM_CPPFLAGS = \
> +	-I$(top_srcdir)/src/lib/include \
> +	-I$(top_srcdir)/src/acpica/source/include \
> +	-I$(top_srcdir)/efi_runtime \
> +	-Wall -Werror -Wextra
>
>   bin_PROGRAMS = fwts
> -fwts_SOURCES = main.c \
> -	acpi/klog/klog.c \
> -	acpi/wakealarm/wakealarm.c \
> -	acpi/syntaxcheck/syntaxcheck.c \
> -	acpi/s3/s3.c \
> -	acpi/s3power/s3power.c \
> -	acpi/s4/s4.c \
> -	acpi/ac_adapter/ac_adapter.c \
> -	acpi/acpiinfo/acpiinfo.c \
> -	acpi/acpidump/acpidump.c \
> -	acpi/acpitables/acpitables.c \
> -	acpi/apicinstance/apicinstance.c \
> -	acpi/battery/battery.c \
> -	acpi/brightness/brightness.c \
> -	acpi/checksum/checksum.c \
> -	acpi/cstates/cstates.c \
> -	acpi/dmar/dmar.c \
> -	acpi/fadt/fadt.c \
> -	acpi/fan/fan.c \
> -	acpi/mcfg/mcfg.c \
> -	acpi/method/method.c \
> -	apic/apicedge/apicedge.c \
> -	acpi/osilinux/osilinux.c \
> -	acpi/lid/lid.c \
> -	acpi/powerbutton/powerbutton.c \
> -	acpi/wmi/wmi.c \
> -	acpi/pcc/pcc.c \
> -	bios/ebda_region/ebda_region.c \
> -	bios/ebdadump/ebdadump.c \
> -	bios/mtrr/mtrr.c \
> -	bios/bios_info/bios_info.c \
> -	bios/bios32/bios32.c \
> -	bios/hdaaudio/hdaaudio.c \
> -	bios/romdump/romdump.c \
> -	bios/os2gap/os2gap.c \
> -	bios/memmapdump/memmapdump.c \
> -	bios/multiproc/mpdump.c \
> -	bios/multiproc/mpcheck.c \
> -	bios/pciirq/pciirq.c \
> -	bios/pnp/pnp.c \
> -	bios/smbios/smbios.c \
> -	cmos/cmosdump/cmosdump.c \
> -	dmi/dmi_decode/dmi_decode.c \
> -	hpet/hpet_check/hpet_check.c \
> -	pci/aspm/aspm.c \
> -	pci/crs/crs.c \
> -	pci/maxreadreq/maxreadreq.c \
> -	cpu/virt/virt.c cpu/virt/virt_svm.c cpu/virt/virt_vmx.c \
> -	cpu/maxfreq/maxfreq.c \
> -	cpu/cpufreq/cpufreq.c \
> -	cpu/nx/nx.c \
> -	cpu/msr/msr.c \
> -	cpu/microcode/microcode.c \
> -	hotkey/hotkey/hotkey.c \
> -	kernel/version/version.c \
> -	kernel/oops/oops.c \
> -	uefi/csm/csm.c \
> -	uefi/uefidump/uefidump.c \
> +
> +#
> +#  fwts main + tests
> +#
> +fwts_SOURCES = main.c 				\
> +	acpi/ac_adapter/ac_adapter.c 		\
> +	acpi/acpidump/acpidump.c 		\
> +	acpi/acpiinfo/acpiinfo.c 		\
> +	acpi/acpitables/acpitables.c 		\
> +	apic/apicedge/apicedge.c 		\
> +	acpi/apicinstance/apicinstance.c 	\
> +	acpi/battery/battery.c 			\
> +	acpi/brightness/brightness.c 		\
> +	acpi/checksum/checksum.c 		\
> +	acpi/cstates/cstates.c 			\
> +	acpi/dmar/dmar.c 			\
> +	acpi/fadt/fadt.c 			\
> +	acpi/fan/fan.c 				\
> +	acpi/klog/klog.c 			\
> +	acpi/lid/lid.c 				\
> +	acpi/mcfg/mcfg.c 			\
> +	acpi/method/method.c 			\
> +	acpi/osilinux/osilinux.c 		\
> +	acpi/pcc/pcc.c 				\
> +	acpi/powerbutton/powerbutton.c 		\
> +	acpi/s3/s3.c 				\
> +	acpi/s3power/s3power.c 			\
> +	acpi/s4/s4.c 				\
> +	acpi/syntaxcheck/syntaxcheck.c 		\
> +	acpi/wakealarm/wakealarm.c 		\
> +	acpi/wmi/wmi.c 				\
> +	bios/bios_info/bios_info.c 		\
> +	bios/bios32/bios32.c 			\
> +	bios/ebda_region/ebda_region.c 		\
> +	bios/ebdadump/ebdadump.c 		\
> +	bios/hdaaudio/hdaaudio.c 		\
> +	bios/memmapdump/memmapdump.c 		\
> +	bios/mtrr/mtrr.c 			\
> +	bios/multiproc/mpcheck.c 		\
> +	bios/multiproc/mpdump.c 		\
> +	bios/os2gap/os2gap.c 			\
> +	bios/pciirq/pciirq.c 			\
> +	bios/pnp/pnp.c 				\
> +	bios/romdump/romdump.c 			\
> +	bios/smbios/smbios.c 			\
> +	cmos/cmosdump/cmosdump.c 		\
> +	cpu/virt/virt.c 			\
> +	cpu/virt/virt_svm.c 			\
> +	cpu/virt/virt_vmx.c			\
> +	cpu/maxfreq/maxfreq.c 			\
> +	cpu/cpufreq/cpufreq.c 			\
> +	cpu/nx/nx.c 				\
> +	cpu/msr/msr.c 				\
> +	cpu/microcode/microcode.c 		\
> +	dmi/dmi_decode/dmi_decode.c 		\
> +	hotkey/hotkey/hotkey.c 			\
> +	hpet/hpet_check/hpet_check.c 		\
> +	kernel/oops/oops.c 			\
> +	kernel/version/version.c 		\
> +	pci/aspm/aspm.c 			\
> +	pci/crs/crs.c 				\
> +	pci/maxreadreq/maxreadreq.c 		\
> +	uefi/csm/csm.c 				\
> +	uefi/uefidump/uefidump.c 		\
>   	uefi/uefirttime/uefirttime.c
>
>   fwts_LDFLAGS = -ljson -lm
>
Acked-by: Ivan Hu <ivan.hu@canonical.com>
Ivan Hu - Dec. 20, 2012, 3:56 a.m.
On 12/13/2012 11:25 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Minor tidy-up of the makefile.  I've re-ordered the tests based on
> category and test name alphabetical order to make it easier to find
> and add tests in the future.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/Makefile.am | 128 ++++++++++++++++++++++++++++++--------------------------
>   1 file changed, 69 insertions(+), 59 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 116b62f..31324c8 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -6,67 +6,77 @@
>   # but libfwts.so depends on libraries produced by acpica/source/compiler.
>   SUBDIRS = acpica/source/compiler lib acpica
>
> -AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -I$(top_srcdir)/efi_runtime -Wall -Werror -Wextra
> +AM_CPPFLAGS = \
> +	-I$(top_srcdir)/src/lib/include \
> +	-I$(top_srcdir)/src/acpica/source/include \
> +	-I$(top_srcdir)/efi_runtime \
> +	-Wall -Werror -Wextra
>
>   bin_PROGRAMS = fwts
> -fwts_SOURCES = main.c \
> -	acpi/klog/klog.c \
> -	acpi/wakealarm/wakealarm.c \
> -	acpi/syntaxcheck/syntaxcheck.c \
> -	acpi/s3/s3.c \
> -	acpi/s3power/s3power.c \
> -	acpi/s4/s4.c \
> -	acpi/ac_adapter/ac_adapter.c \
> -	acpi/acpiinfo/acpiinfo.c \
> -	acpi/acpidump/acpidump.c \
> -	acpi/acpitables/acpitables.c \
> -	acpi/apicinstance/apicinstance.c \
> -	acpi/battery/battery.c \
> -	acpi/brightness/brightness.c \
> -	acpi/checksum/checksum.c \
> -	acpi/cstates/cstates.c \
> -	acpi/dmar/dmar.c \
> -	acpi/fadt/fadt.c \
> -	acpi/fan/fan.c \
> -	acpi/mcfg/mcfg.c \
> -	acpi/method/method.c \
> -	apic/apicedge/apicedge.c \
> -	acpi/osilinux/osilinux.c \
> -	acpi/lid/lid.c \
> -	acpi/powerbutton/powerbutton.c \
> -	acpi/wmi/wmi.c \
> -	acpi/pcc/pcc.c \
> -	bios/ebda_region/ebda_region.c \
> -	bios/ebdadump/ebdadump.c \
> -	bios/mtrr/mtrr.c \
> -	bios/bios_info/bios_info.c \
> -	bios/bios32/bios32.c \
> -	bios/hdaaudio/hdaaudio.c \
> -	bios/romdump/romdump.c \
> -	bios/os2gap/os2gap.c \
> -	bios/memmapdump/memmapdump.c \
> -	bios/multiproc/mpdump.c \
> -	bios/multiproc/mpcheck.c \
> -	bios/pciirq/pciirq.c \
> -	bios/pnp/pnp.c \
> -	bios/smbios/smbios.c \
> -	cmos/cmosdump/cmosdump.c \
> -	dmi/dmi_decode/dmi_decode.c \
> -	hpet/hpet_check/hpet_check.c \
> -	pci/aspm/aspm.c \
> -	pci/crs/crs.c \
> -	pci/maxreadreq/maxreadreq.c \
> -	cpu/virt/virt.c cpu/virt/virt_svm.c cpu/virt/virt_vmx.c \
> -	cpu/maxfreq/maxfreq.c \
> -	cpu/cpufreq/cpufreq.c \
> -	cpu/nx/nx.c \
> -	cpu/msr/msr.c \
> -	cpu/microcode/microcode.c \
> -	hotkey/hotkey/hotkey.c \
> -	kernel/version/version.c \
> -	kernel/oops/oops.c \
> -	uefi/csm/csm.c \
> -	uefi/uefidump/uefidump.c \
> +
> +#
> +#  fwts main + tests
> +#
> +fwts_SOURCES = main.c 				\
> +	acpi/ac_adapter/ac_adapter.c 		\
> +	acpi/acpidump/acpidump.c 		\
> +	acpi/acpiinfo/acpiinfo.c 		\
> +	acpi/acpitables/acpitables.c 		\
> +	apic/apicedge/apicedge.c 		\
> +	acpi/apicinstance/apicinstance.c 	\
> +	acpi/battery/battery.c 			\
> +	acpi/brightness/brightness.c 		\
> +	acpi/checksum/checksum.c 		\
> +	acpi/cstates/cstates.c 			\
> +	acpi/dmar/dmar.c 			\
> +	acpi/fadt/fadt.c 			\
> +	acpi/fan/fan.c 				\
> +	acpi/klog/klog.c 			\
> +	acpi/lid/lid.c 				\
> +	acpi/mcfg/mcfg.c 			\
> +	acpi/method/method.c 			\
> +	acpi/osilinux/osilinux.c 		\
> +	acpi/pcc/pcc.c 				\
> +	acpi/powerbutton/powerbutton.c 		\
> +	acpi/s3/s3.c 				\
> +	acpi/s3power/s3power.c 			\
> +	acpi/s4/s4.c 				\
> +	acpi/syntaxcheck/syntaxcheck.c 		\
> +	acpi/wakealarm/wakealarm.c 		\
> +	acpi/wmi/wmi.c 				\
> +	bios/bios_info/bios_info.c 		\
> +	bios/bios32/bios32.c 			\
> +	bios/ebda_region/ebda_region.c 		\
> +	bios/ebdadump/ebdadump.c 		\
> +	bios/hdaaudio/hdaaudio.c 		\
> +	bios/memmapdump/memmapdump.c 		\
> +	bios/mtrr/mtrr.c 			\
> +	bios/multiproc/mpcheck.c 		\
> +	bios/multiproc/mpdump.c 		\
> +	bios/os2gap/os2gap.c 			\
> +	bios/pciirq/pciirq.c 			\
> +	bios/pnp/pnp.c 				\
> +	bios/romdump/romdump.c 			\
> +	bios/smbios/smbios.c 			\
> +	cmos/cmosdump/cmosdump.c 		\
> +	cpu/virt/virt.c 			\
> +	cpu/virt/virt_svm.c 			\
> +	cpu/virt/virt_vmx.c			\
> +	cpu/maxfreq/maxfreq.c 			\
> +	cpu/cpufreq/cpufreq.c 			\
> +	cpu/nx/nx.c 				\
> +	cpu/msr/msr.c 				\
> +	cpu/microcode/microcode.c 		\
> +	dmi/dmi_decode/dmi_decode.c 		\
> +	hotkey/hotkey/hotkey.c 			\
> +	hpet/hpet_check/hpet_check.c 		\
> +	kernel/oops/oops.c 			\
> +	kernel/version/version.c 		\
> +	pci/aspm/aspm.c 			\
> +	pci/crs/crs.c 				\
> +	pci/maxreadreq/maxreadreq.c 		\
> +	uefi/csm/csm.c 				\
> +	uefi/uefidump/uefidump.c 		\
>   	uefi/uefirttime/uefirttime.c
>
>   fwts_LDFLAGS = -ljson -lm
>
Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/src/Makefile.am b/src/Makefile.am
index 116b62f..31324c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,67 +6,77 @@ 
 # but libfwts.so depends on libraries produced by acpica/source/compiler.
 SUBDIRS = acpica/source/compiler lib acpica
  
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -I$(top_srcdir)/efi_runtime -Wall -Werror -Wextra
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib/include \
+	-I$(top_srcdir)/src/acpica/source/include \
+	-I$(top_srcdir)/efi_runtime \
+	-Wall -Werror -Wextra
 
 bin_PROGRAMS = fwts
-fwts_SOURCES = main.c \
-	acpi/klog/klog.c \
-	acpi/wakealarm/wakealarm.c \
-	acpi/syntaxcheck/syntaxcheck.c \
-	acpi/s3/s3.c \
-	acpi/s3power/s3power.c \
-	acpi/s4/s4.c \
-	acpi/ac_adapter/ac_adapter.c \
-	acpi/acpiinfo/acpiinfo.c \
-	acpi/acpidump/acpidump.c \
-	acpi/acpitables/acpitables.c \
-	acpi/apicinstance/apicinstance.c \
-	acpi/battery/battery.c \
-	acpi/brightness/brightness.c \
-	acpi/checksum/checksum.c \
-	acpi/cstates/cstates.c \
-	acpi/dmar/dmar.c \
-	acpi/fadt/fadt.c \
-	acpi/fan/fan.c \
-	acpi/mcfg/mcfg.c \
-	acpi/method/method.c \
-	apic/apicedge/apicedge.c \
-	acpi/osilinux/osilinux.c \
-	acpi/lid/lid.c \
-	acpi/powerbutton/powerbutton.c \
-	acpi/wmi/wmi.c \
-	acpi/pcc/pcc.c \
-	bios/ebda_region/ebda_region.c \
-	bios/ebdadump/ebdadump.c \
-	bios/mtrr/mtrr.c \
-	bios/bios_info/bios_info.c \
-	bios/bios32/bios32.c \
-	bios/hdaaudio/hdaaudio.c \
-	bios/romdump/romdump.c \
-	bios/os2gap/os2gap.c \
-	bios/memmapdump/memmapdump.c \
-	bios/multiproc/mpdump.c \
-	bios/multiproc/mpcheck.c \
-	bios/pciirq/pciirq.c \
-	bios/pnp/pnp.c \
-	bios/smbios/smbios.c \
-	cmos/cmosdump/cmosdump.c \
-	dmi/dmi_decode/dmi_decode.c \
-	hpet/hpet_check/hpet_check.c \
-	pci/aspm/aspm.c \
-	pci/crs/crs.c \
-	pci/maxreadreq/maxreadreq.c \
-	cpu/virt/virt.c cpu/virt/virt_svm.c cpu/virt/virt_vmx.c \
-	cpu/maxfreq/maxfreq.c \
-	cpu/cpufreq/cpufreq.c \
-	cpu/nx/nx.c \
-	cpu/msr/msr.c \
-	cpu/microcode/microcode.c \
-	hotkey/hotkey/hotkey.c \
-	kernel/version/version.c \
-	kernel/oops/oops.c \
-	uefi/csm/csm.c \
-	uefi/uefidump/uefidump.c \
+
+#
+#  fwts main + tests
+#
+fwts_SOURCES = main.c 				\
+	acpi/ac_adapter/ac_adapter.c 		\
+	acpi/acpidump/acpidump.c 		\
+	acpi/acpiinfo/acpiinfo.c 		\
+	acpi/acpitables/acpitables.c 		\
+	apic/apicedge/apicedge.c 		\
+	acpi/apicinstance/apicinstance.c 	\
+	acpi/battery/battery.c 			\
+	acpi/brightness/brightness.c 		\
+	acpi/checksum/checksum.c 		\
+	acpi/cstates/cstates.c 			\
+	acpi/dmar/dmar.c 			\
+	acpi/fadt/fadt.c 			\
+	acpi/fan/fan.c 				\
+	acpi/klog/klog.c 			\
+	acpi/lid/lid.c 				\
+	acpi/mcfg/mcfg.c 			\
+	acpi/method/method.c 			\
+	acpi/osilinux/osilinux.c 		\
+	acpi/pcc/pcc.c 				\
+	acpi/powerbutton/powerbutton.c 		\
+	acpi/s3/s3.c 				\
+	acpi/s3power/s3power.c 			\
+	acpi/s4/s4.c 				\
+	acpi/syntaxcheck/syntaxcheck.c 		\
+	acpi/wakealarm/wakealarm.c 		\
+	acpi/wmi/wmi.c 				\
+	bios/bios_info/bios_info.c 		\
+	bios/bios32/bios32.c 			\
+	bios/ebda_region/ebda_region.c 		\
+	bios/ebdadump/ebdadump.c 		\
+	bios/hdaaudio/hdaaudio.c 		\
+	bios/memmapdump/memmapdump.c 		\
+	bios/mtrr/mtrr.c 			\
+	bios/multiproc/mpcheck.c 		\
+	bios/multiproc/mpdump.c 		\
+	bios/os2gap/os2gap.c 			\
+	bios/pciirq/pciirq.c 			\
+	bios/pnp/pnp.c 				\
+	bios/romdump/romdump.c 			\
+	bios/smbios/smbios.c 			\
+	cmos/cmosdump/cmosdump.c 		\
+	cpu/virt/virt.c 			\
+	cpu/virt/virt_svm.c 			\
+	cpu/virt/virt_vmx.c			\
+	cpu/maxfreq/maxfreq.c 			\
+	cpu/cpufreq/cpufreq.c 			\
+	cpu/nx/nx.c 				\
+	cpu/msr/msr.c 				\
+	cpu/microcode/microcode.c 		\
+	dmi/dmi_decode/dmi_decode.c 		\
+	hotkey/hotkey/hotkey.c 			\
+	hpet/hpet_check/hpet_check.c 		\
+	kernel/oops/oops.c 			\
+	kernel/version/version.c 		\
+	pci/aspm/aspm.c 			\
+	pci/crs/crs.c 				\
+	pci/maxreadreq/maxreadreq.c 		\
+	uefi/csm/csm.c 				\
+	uefi/uefidump/uefidump.c 		\
 	uefi/uefirttime/uefirttime.c
 
 fwts_LDFLAGS = -ljson -lm