From patchwork Thu Dec 13 15:36:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 206125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4358C2C007C for ; Fri, 14 Dec 2012 02:36:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TjApr-000455-1U; Thu, 13 Dec 2012 15:36:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TjApo-00044C-24 for fwts-devel@lists.ubuntu.com; Thu, 13 Dec 2012 15:36:28 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TjApn-0007N3-V8 for fwts-devel@lists.ubuntu.com; Thu, 13 Dec 2012 15:36:28 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] src: lib: Makefile.am: Minor tidy up of the makefile. Date: Thu, 13 Dec 2012 15:36:27 +0000 Message-Id: <1355412987-7843-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Slight re-ordering of sources in makefile and tidy up of layout. Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/lib/src/Makefile.am | 125 +++++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am index 2ef73b0..65a2e55 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -1,64 +1,71 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib/include \ - -I$(top_srcdir)/src/acpica/source/include \ - -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/src/lib/include \ + -I$(top_srcdir)/src/acpica/source/include \ + -I$(top_srcdir)/src/acpica/source/compiler \ -Wall -Werror -Wextra pkglib_LTLIBRARIES = libfwts.la -libfwts_la_LDFLAGS = -lm -lpcre -lpthread -ljson -version-info 1:0:0 \ - -L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl -libfwts_la_SOURCES = \ - fwts_acpi.c \ - fwts_acpid.c \ - fwts_acpi_tables.c \ - fwts_acpi_method.c \ - fwts_args.c \ - fwts_alloc.c \ - fwts_binpaths.c \ - fwts_checkeuid.c \ - fwts_checksum.c \ - fwts_cmos.c \ - fwts_cpu.c \ - fwts_dump.c \ - fwts_dump_data.c \ - fwts_ebda.c \ - fwts_fileio.c \ - fwts_firmware.c \ - fwts_formatting.c \ - fwts_framework.c \ - fwts_get.c \ - fwts_guid.c \ - fwts_gpe.c \ - fwts_hwinfo.c \ - fwts_iasl.c \ - fwts_interactive.c \ - fwts_keymap.c \ - fwts_klog.c \ - fwts_list.c \ - fwts_log.c \ - fwts_log_plaintext.c \ - fwts_log_json.c \ - fwts_log_xml.c \ - fwts_log_html.c \ - fwts_memorymap.c \ - fwts_microcode.c \ - fwts_mmap.c \ - fwts_multiproc.c \ - fwts_oops.c \ - fwts_pipeio.c \ - fwts_scan_efi_systab.c \ - fwts_set.c \ - fwts_smbios.c \ - fwts_stringextras.c \ - fwts_summary.c \ - fwts_tag.c \ - fwts_text_list.c \ - fwts_tty.c \ - fwts_uefi.c \ - fwts_virt.c \ - fwts_wakealarm.c \ - fwts_ac_adapter.c \ - fwts_battery.c \ - fwts_button.c \ - fwts_efi_module.c +libfwts_la_LDFLAGS = \ + -lm -lpcre -lpthread -ljson \ + -version-info 1:0:0 \ + -L$(top_srcdir)/src/acpica/source/compiler \ + -lfwtsiasl + +# +# Components of the fwts core helper library libfwts +# +libfwts_la_SOURCES = \ + fwts_ac_adapter.c \ + fwts_acpi_method.c \ + fwts_acpi_tables.c \ + fwts_acpi.c \ + fwts_acpid.c \ + fwts_alloc.c \ + fwts_args.c \ + fwts_battery.c \ + fwts_binpaths.c \ + fwts_button.c \ + fwts_checkeuid.c \ + fwts_checksum.c \ + fwts_cmos.c \ + fwts_cpu.c \ + fwts_dump.c \ + fwts_dump_data.c \ + fwts_ebda.c \ + fwts_efi_module.c \ + fwts_fileio.c \ + fwts_firmware.c \ + fwts_formatting.c \ + fwts_framework.c \ + fwts_get.c \ + fwts_gpe.c \ + fwts_guid.c \ + fwts_hwinfo.c \ + fwts_iasl.c \ + fwts_interactive.c \ + fwts_keymap.c \ + fwts_klog.c \ + fwts_list.c \ + fwts_log.c \ + fwts_log_html.c \ + fwts_log_json.c \ + fwts_log_plaintext.c \ + fwts_log_xml.c \ + fwts_memorymap.c \ + fwts_microcode.c \ + fwts_mmap.c \ + fwts_multiproc.c \ + fwts_oops.c \ + fwts_pipeio.c \ + fwts_scan_efi_systab.c \ + fwts_set.c \ + fwts_smbios.c \ + fwts_stringextras.c \ + fwts_summary.c \ + fwts_tag.c \ + fwts_text_list.c \ + fwts_tty.c \ + fwts_uefi.c \ + fwts_virt.c \ + fwts_wakealarm.c