From patchwork Tue Jan 20 09:45:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sebastien dugue X-Patchwork-Id: 5667131 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 10ED6C058D for ; Tue, 20 Jan 2015 10:10:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 377E720272 for ; Tue, 20 Jan 2015 10:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2210320389 for ; Tue, 20 Jan 2015 10:10:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752198AbbATKK2 (ORCPT ); Tue, 20 Jan 2015 05:10:28 -0500 Received: from odin2.bull.net ([129.184.85.11]:58501 "EHLO odin2.bull.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751966AbbATKK1 convert rfc822-to-8bit (ORCPT ); Tue, 20 Jan 2015 05:10:27 -0500 X-Greylist: delayed 1528 seconds by postgrey-1.27 at vger.kernel.org; Tue, 20 Jan 2015 05:10:26 EST Received: from BUMSG1WM.fr.ad.bull.net (bumsg1wm.fr.ad.bull.net [10.192.1.15]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by odin2.bull.net (Bull S.A.) with ESMTP id 8A05C203F0; Tue, 20 Jan 2015 10:45:04 +0100 (CET) Received: from b012350-ux (10.192.1.123) by BUMSG1WM.fr.ad.bull.net (10.192.1.15) with Microsoft SMTP Server (TLS) id 14.3.210.2; Tue, 20 Jan 2015 10:45:04 +0100 Date: Tue, 20 Jan 2015 10:45:03 +0100 From: =?UTF-8?B?U8OpYmFzdGllbiBEdWd1w6k=?= To: linux-rdma CC: Adrian Chiris Subject: [PATCH 2/2] mstflint: Install mflash/mtcr libraries & headers Message-ID: <20150120104503.5420c06c@b012350-ux> In-Reply-To: <20150120104126.7f424116@b012350-ux> References: <20150120104126.7f424116@b012350-ux> Organization: BULL X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [10.192.1.123] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is necessary to be able to use libmflash & libmtcr from external programs. This also installs the needed libreg_access.a and libtools_layouts.a. Signed-off-by: Sébastien Dugué --- mflash/Makefile.am | 8 +++++++- mstflint.spec.in | 4 ++-- mtcr_ul/Makefile.am | 5 +++-- reg_access/Makefile.am | 3 ++- tools_layouts/Makefile.am | 4 +++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mflash/Makefile.am b/mflash/Makefile.am index 632539c..68099e3 100644 --- a/mflash/Makefile.am +++ b/mflash/Makefile.am @@ -35,8 +35,14 @@ INCLUDES= -I. -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -I$(top_src AM_CFLAGS = -MD -pipe -Wall -W -DMST_UL -g ${MFLASH_INBAND_FLAG} -noinst_LIBRARIES = libmflash.a + +libmflash_adir = $(libdir)/mstflint +libmflash_a_LIBRARIES = libmflash.a libmflash_a_SOURCES = mflash.c mflash.h\ mflash_pack_layer.c mflash_pack_layer.h mflash_access_layer.c mflash_access_layer.h\ mflash_types.h mflash_common_structs.h + +libraryincludedir=$(includedir)/mstflint +libraryinclude_HEADERS = mflash.h mflash_types.h mflash_common_structs.h \ + $(top_srcdir)/common/compatibility.h diff --git a/mstflint.spec.in b/mstflint.spec.in index 0d9281b..966224c 100644 --- a/mstflint.spec.in +++ b/mstflint.spec.in @@ -78,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mstmcra %{_bindir}/mstconfig %{_bindir}/hca_self_test.ofed -%{_includedir}/mtcr_ul/mtcr.h -%{_libdir}/libmtcr_ul.a +%{_includedir}/mstflint +%{_libdir}/mstflint/* %{_datadir}/mstflint %{_mandir}/man1/* diff --git a/mtcr_ul/Makefile.am b/mtcr_ul/Makefile.am index dd1b68d..59fc6c5 100644 --- a/mtcr_ul/Makefile.am +++ b/mtcr_ul/Makefile.am @@ -33,7 +33,8 @@ # Makefile.am -- Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -lib_LIBRARIES = libmtcr_ul.a +libmtcr_ul_adir = $(libdir)/mstflint +libmtcr_ul_a_LIBRARIES = libmtcr_ul.a libmtcr_ul_a_SOURCES = mtcr_ul.c mtcr_ib.h mtcr_int_defs.h\ mtcr_tools_cif.c mtcr_tools_cif.h\ @@ -48,6 +49,6 @@ else libmtcr_ul_a_CFLAGS += -DNO_INBAND endif -libraryincludedir=$(includedir)/mtcr_ul +libraryincludedir=$(includedir)/mstflint libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am index 7f78060..99a83af 100644 --- a/reg_access/Makefile.am +++ b/reg_access/Makefile.am @@ -40,7 +40,8 @@ INCLUDES = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/ AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC) -noinst_LIBRARIES = libreg_access.a +libreg_access_adir = $(libdir)/mstflint +libreg_access_a_LIBRARIES = libreg_access.a libreg_access_a_SOURCES = reg_access.c reg_access.h libreg_access_a_DEPENDENCIES = $(USER_DIR)/tools_layouts/libtools_layouts.a diff --git a/tools_layouts/Makefile.am b/tools_layouts/Makefile.am index 17bdf6c..8880907 100644 --- a/tools_layouts/Makefile.am +++ b/tools_layouts/Makefile.am @@ -33,7 +33,9 @@ # Makefile.am -- Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/mtcr_ul -I$(top_srcdir)/common AM_CFLAGS = -Wall -W -g -MP -MD -pipe $(COMPILER_FPIC) -noinst_LIBRARIES = libtools_layouts.a + +libtools_layouts_adir = $(libdir)/mstflint +libtools_layouts_a_LIBRARIES = libtools_layouts.a libtools_layouts_a_SOURCES = cibfw_layouts.c adb_to_c_utils.c adb_to_c_utils.h cibfw_layouts.h \ register_access_open_layouts.h register_access_open_layouts.c \