From patchwork Tue Jul 3 09:23:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 168746 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 D3CB22C0100 for ; Tue, 3 Jul 2012 19:24:07 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SlzL4-0002gV-LR for incoming@patchwork.ozlabs.org; Tue, 03 Jul 2012 09:24:06 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SlzL1-0002gO-V4 for fwts-devel@lists.ubuntu.com; Tue, 03 Jul 2012 09:24:03 +0000 Received: from [210.242.151.101] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SlzL1-0002QV-3B; Tue, 03 Jul 2012 09:24:03 +0000 From: Keng-Yu Lin To: fwts-devel@lists.ubuntu.com Subject: [PATCH] Install the libraries in pkglib Date: Tue, 3 Jul 2012 17:23:57 +0800 Message-Id: <1341307437-32354-1-git-send-email-kengyu@canonical.com> X-Mailer: git-send-email 1.7.9.5 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 For now these libraries are for fwts only, so it is more proper to install them in the "private" pkglib directory (/usr/lib/fwts/*). Signed-off-by: Keng-Yu Lin Acked-by: Colin Ian King Acked-by: Alex Hung Acked-by: Alex Hung --- debian/libfwts1.install | 2 +- debian/libfwtsacpica1.install | 2 +- debian/libfwtsiasl1.install | 2 +- src/acpica/Makefile.am | 2 +- src/acpica/source/compiler/Makefile.am | 2 +- src/lib/src/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/libfwts1.install b/debian/libfwts1.install index 2ac324c..c65e209 100644 --- a/debian/libfwts1.install +++ b/debian/libfwts1.install @@ -1 +1 @@ -usr/lib/libfwts.so.* usr/lib +usr/lib/fwts/libfwts.so.* usr/lib/fwts diff --git a/debian/libfwtsacpica1.install b/debian/libfwtsacpica1.install index 6213e40..a411a7a 100644 --- a/debian/libfwtsacpica1.install +++ b/debian/libfwtsacpica1.install @@ -1 +1 @@ -usr/lib/libfwtsacpica.so.* usr/lib +usr/lib/fwts/libfwtsacpica.so.* usr/lib/fwts diff --git a/debian/libfwtsiasl1.install b/debian/libfwtsiasl1.install index 043c75f..e94d910 100644 --- a/debian/libfwtsiasl1.install +++ b/debian/libfwtsiasl1.install @@ -1 +1 @@ -usr/lib/libfwtsiasl.so.* usr/lib +usr/lib/fwts/libfwtsiasl.so.* usr/lib/fwts diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am index 7d1249c..3187432 100644 --- a/src/acpica/Makefile.am +++ b/src/acpica/Makefile.am @@ -41,7 +41,7 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c CLEANFILES = osunixxf_munged.c -lib_LTLIBRARIES = libfwtsacpica.la +pkglib_LTLIBRARIES = libfwtsacpica.la libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0 libfwtsacpica_la_SOURCES = \ fwts_acpica.c \ diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am index 74ae927..cee1f4f 100644 --- a/src/acpica/source/compiler/Makefile.am +++ b/src/acpica/source/compiler/Makefile.am @@ -48,7 +48,7 @@ prparserparse.c: prparser.y prparserlex.c: prparser.l ${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l -lib_LTLIBRARIES = libfwtsiasl.la +pkglib_LTLIBRARIES = libfwtsiasl.la BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ dtparserparse.c dtparserlex.c \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am index f846621..ea97cdb 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/acpica/source/compiler \ -Wall -Werror -lib_LTLIBRARIES = libfwts.la +pkglib_LTLIBRARIES = libfwts.la libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \ -L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl