From patchwork Thu Dec 10 14:24:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 58216 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp527212lbb; Thu, 10 Dec 2015 06:29:52 -0800 (PST) X-Received: by 10.140.141.138 with SMTP id 132mr6960362qhn.74.1449757792282; Thu, 10 Dec 2015 06:29:52 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c129si15025168qha.15.2015.12.10.06.29.51; Thu, 10 Dec 2015 06:29:52 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id CD91E61847; Thu, 10 Dec 2015 14:29:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C6B336198B; Thu, 10 Dec 2015 14:25:23 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0560461A37; Thu, 10 Dec 2015 14:25:12 +0000 (UTC) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by lists.linaro.org (Postfix) with ESMTPS id BB3CB618D1 for ; Thu, 10 Dec 2015 14:24:40 +0000 (UTC) Received: by lbblt2 with SMTP id lt2so52277090lbb.3 for ; Thu, 10 Dec 2015 06:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y7WmzJm78uB5JQ/9i1T3riFfWokzP5rgO7uwRLOFlDs=; b=vgCPHOQXwhuyfs2xfHDqt4ijmt55pyBn9BB8bKiYanE7lFRWaBhalH1AXPn7nZrd60 JjDOso+UEpyH4TDRhcuFRAk0e1A+r7+7VpCrv6jT55yIGL2P9NnOYwnlCuxVWPNg372U Q4pL2Y/ntYrbLpCrsyom4s9V5XZBQ54QTjxY1GF5I/ySTT0hNrPI/D62Ewc0IoaueH9S p5NuK/keczee0Tg7ZOzmCpLUr27H+C3+ZftxrelDP+a1Jjb4VaLib1nfiH+q3unweXuz 8obCXwHxI4Cu2NlrJdH3nxtlOymr2MudglladB0T6+lu/Ej/bxYAVsaU718CV6IWxMLv rVqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y7WmzJm78uB5JQ/9i1T3riFfWokzP5rgO7uwRLOFlDs=; b=AdmrNrCfk7MjHbkubjdNTtDxp16ePnqodXp61Abe/CATjUkeuyWbcFkcaX/AiRplpq /nAWBRDYCCHHPOrWHudM6PjyWUZk4/Xj0MmKjojJcrq5J4OYBsdUZFjw4zfZDxMfF1EN 3hxlE9uCo62ft9YL7VuDdlGZ7EmvmGZ+StoE20PHKCLGhPxSTIUWSwWqG46GHQ+1sbbs ss0QEVzziW7xR8hzbknNDQCLL6ibkmuwo9GzopKj1Oi4/9ZXmy134FtOqvAnp4qrn433 09vGonDgg5gX5F6mC5mqjUagVEvt+Zfy7PAhzOzYiuKldL+10v1PeM0V2P03YkztWiL4 YgAw== X-Gm-Message-State: ALoCoQkp/QgzOrXilXpLcGEMJHY68QFuI+EWNUB5noNIsvzBUqg1/Lkbp2Q7VEYXNnlB6WpLyC0YYkAF5QJaI6GkWetM0utStA== X-Received: by 10.112.166.33 with SMTP id zd1mr4612487lbb.113.1449757479460; Thu, 10 Dec 2015 06:24:39 -0800 (PST) Received: from localhost.localdomain (ppp91-76-173-134.pppoe.mtu-net.ru. [91.76.173.134]) by smtp.gmail.com with ESMTPSA id xn8sm2364938lbb.41.2015.12.10.06.24.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Dec 2015 06:24:38 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 10 Dec 2015 17:24:21 +0300 Message-Id: <1449757466-6287-6-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449757466-6287-1-git-send-email-maxim.uvarov@linaro.org> References: <1449757466-6287-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv17 05/10] helper: move odp pause to installed helper X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" ipc pktio depends on ring which depends on pause. Move pause to installed helpers to support out of tree builds. Signed-off-by: Maxim Uvarov --- helper/Makefile.am | 4 ++-- helper/{odph_pause.h => include/odp/helper/pause.h} | 0 helper/ring.c | 2 +- helper/test/pause.c | 2 +- platform/linux-generic/Makefile.am | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) rename helper/{odph_pause.h => include/odp/helper/pause.h} (100%) diff --git a/helper/Makefile.am b/helper/Makefile.am index 1906ae2..9caaba0 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -18,11 +18,11 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ - $(srcdir)/include/odp/helper/udp.h + $(srcdir)/include/odp/helper/udp.h \ + $(srcdir)/include/odp/helper/pause.h noinst_HEADERS = \ $(srcdir)/odph_debug.h \ - $(srcdir)/odph_pause.h \ $(srcdir)/odph_hashtable.h \ $(srcdir)/odph_lineartable.h \ $(srcdir)/odph_list_internal.h diff --git a/helper/odph_pause.h b/helper/include/odp/helper/pause.h similarity index 100% rename from helper/odph_pause.h rename to helper/include/odp/helper/pause.h diff --git a/helper/ring.c b/helper/ring.c index e113606..6b233cc 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -71,7 +71,7 @@ #include #include -#include "odph_pause.h" +#include #include #include #include diff --git a/helper/test/pause.c b/helper/test/pause.c index f5f5da3..c5a5f1a 100644 --- a/helper/test/pause.c +++ b/helper/test/pause.c @@ -5,7 +5,7 @@ */ #include -#include "../odph_pause.h" +#include int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) { diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 70bd8fe..f71c0f2 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/helper/include +AM_CFLAGS += -I$(top_srcdir)/helper include_HEADERS = \ $(top_srcdir)/include/odp.h