[PATCH v2] src/Makefile.am: use pkg-config to include glib

[IvanHu]

On 07/29/2014 01:18 AM, Alberto Milone wrote:
> ---
>   src/Makefile.am | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index ce0b31e..d7a031f 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -11,8 +11,7 @@ AM_CPPFLAGS = \
>   	-I$(top_srcdir)/src/acpica/source/include \
>   	-I$(top_srcdir)/src/acpica/source/compiler \
>   	-I$(top_srcdir)/efi_runtime \
> -	-pthread -I/usr/include/glib-2.0 \
> -	-I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
> +	-pthread $(shell pkg-config --cflags glib-2.0) \
>   	-Wall -Werror -Wextra
>
>   bin_PROGRAMS = fwts
> @@ -94,10 +93,10 @@ fwts_SOURCES = main.c 				\
>   	uefi/uefivarinfo/uefivarinfo.c		\
>   	uefi/uefibootpath/uefibootpath.c
>
> -fwts_LDFLAGS = -lm
> +fwts_LDFLAGS = -lm $(shell pkg-config --libs glib-2.0)
>
>   fwts_LDADD = \
>   	-L$(top_builddir)/src/acpica -lfwtsacpica \
> -	-Llib/src -lfwts -lgio-2.0 -lgobject-2.0 -lglib-2.0
> +	-Llib/src -lfwts
>
>   man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1
>

Build error on my machine,

o uefi/securebootcert/fwts-securebootcert.o 
uefi/uefivarinfo/fwts-uefivarinfo.o 
uefi/uefibootpath/fwts-uefibootpath.o  -lm -lglib-2.0 -L../src/acpica 
/home/ivanhu/work/fwts/src/acpica/.libs/libfwtsacpica.so -Llib/src 
/home/ivanhu/work/fwts/src/lib/src/.libs/libfwts.so -ljson -Wl,-rpath 
-Wl,/usr/local/lib/fwts
acpi/s3/fwts-s3.o: In function `logind_do_suspend':
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:339: undefined reference to 
`g_dbus_proxy_call_sync'
acpi/s3/fwts-s3.o: In function `logind_init_proxy':
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:136: undefined reference to 
`g_dbus_proxy_new_sync'
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:127: undefined reference to 
`g_bus_get_sync'
acpi/s3/fwts-s3.o: In function `logind_wait_for_suspend_resume':
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:377: undefined reference to 
`g_dbus_connection_signal_subscribe'
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:405: undefined reference to 
`g_dbus_connection_signal_unsubscribe'
acpi/s3/fwts-s3.o: In function `logind_can_do_action':
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:224: undefined reference to 
`g_dbus_proxy_call_sync'
acpi/s3/fwts-s3.o: In function `free_fwts_vars':
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:87: undefined reference to 
`g_object_unref'
/home/ivanhu/work/fwts/src/acpi/s3/s3.c:91: undefined reference to 
`g_object_unref'
collect2: error: ld returned 1 exit status
make[3]: *** [fwts] Error 1
make[3]: Leaving directory `/home/work/fwts/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/work/fwts/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/work/fwts'
make: *** [all] Error 2