From patchwork Tue Jul 29 09:12:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 374378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id A3A67140199; Tue, 29 Jul 2014 19:12:21 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XC3SG-0007f5-Dm; Tue, 29 Jul 2014 09:12:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XC3SB-0007ez-FY for fwts-devel@lists.ubuntu.com; Tue, 29 Jul 2014 09:12:15 +0000 Received: from host179-91-dynamic.2-87-r.retail.telecomitalia.it ([87.2.91.179] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XC3SB-0003Yy-5u for fwts-devel@lists.ubuntu.com; Tue, 29 Jul 2014 09:12:15 +0000 From: Alberto Milone To: fwts-devel@lists.ubuntu.com Subject: [PATCH v3] src/Makefile.am: use pkg-config to include glib and gio Date: Tue, 29 Jul 2014 11:12:11 +0200 Message-Id: <1406625131-32757-1-git-send-email-alberto.milone@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com --- src/Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) Acked-by: Keng-Yu Lin Acked-by: Ivan Hu diff --git a/src/Makefile.am b/src/Makefile.am index ce0b31e..d472d5c 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 `pkg-config --cflags glib-2.0 gio-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 `pkg-config --libs glib-2.0 gio-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