From patchwork Thu Dec 13 15:25:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: src/Makefile.am: Tidy up fwts main makefile, re-order tests Date: Thu, 13 Dec 2012 05:25:30 -0000 From: Colin King X-Patchwork-Id: 206118 Message-Id: <1355412330-32461-1-git-send-email-colin.king@canonical.com> To: fwts-devel@lists.ubuntu.com From: Colin Ian King 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 Acked-by: Keng-Yu Lin Acked-by: Ivan Hu Acked-by: Ivan Hu --- 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