[PATCH] src: lib: Makefile.am: Minor tidy up of the makefile.

IvanHu ivan.hu at canonical.com
Thu Dec 20 03:56:58 UTC 2012


On 12/13/2012 11:36 PM, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> Slight re-ordering of sources in makefile and tidy up of layout.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>   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
>
Acked-by: Ivan Hu <ivan.hu at canonical.com>



More information about the fwts-devel mailing list