From patchwork Wed Sep 7 19:52:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 75687 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp489994qgf; Wed, 7 Sep 2016 12:52:35 -0700 (PDT) X-Received: by 10.36.219.138 with SMTP id c132mr8720020itg.16.1473277955374; Wed, 07 Sep 2016 12:52:35 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o2si7120905ito.79.2016.09.07.12.52.34; Wed, 07 Sep 2016 12:52:35 -0700 (PDT) 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8C7DF610A6; Wed, 7 Sep 2016 19:52:34 +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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 7752660831; Wed, 7 Sep 2016 19:52:29 +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 CF35B6080F; Wed, 7 Sep 2016 19:52:27 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 9E35D6071D for ; Wed, 7 Sep 2016 19:52:26 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id l131so6162386lfl.2 for ; Wed, 07 Sep 2016 12:52:26 -0700 (PDT) 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; bh=YqwzzdZpzW+LNFrq/0rewNEjvVPS3jYYE8qOLdM7ENU=; b=QNv6gzajjeHocWXROgcGhKtSv4sTBBgEQjBoW3PbBX12jp/MI8bRkLeZiuBKvtByAq iqOVLlTJFybubwVuwzr9fotUrbxNBbVjFX63LLiQ1PTw4WTt1D2GTwk6oLEOM+ShBPfH u0wcbpHkJtqCA8pd1DMGDESe7uvxgIHRsUu4GutT3YljgfQVEOHwfH5sCSE2SLfispF7 BgT0ZDPcUHGQYXP+MqL3Y6g3YTa6oqOBi664/dHrQSkZI+08+zwlwac86rYGJBpBLfa7 VmR77H4jpQ+xZD/xBUfLpMtnrqgtr+wtjgXFCdMZnL+CqqgiCbsK0RjOJNposCDuKmym bEwg== X-Gm-Message-State: AE9vXwNxWt+K+7JmxoYM0Ew+C4OyyDFde0bArImHxgQDSpErWZcuEVgq1TfQ5TpQGha9pOnkUXI= X-Received: by 10.46.32.203 with SMTP id g72mr284455lji.30.1473277945015; Wed, 07 Sep 2016 12:52:25 -0700 (PDT) Received: from Ubuntu15.localdomain (dyn-xdsl-188-117-12-66.nebulazone.fi. [188.117.12.66]) by smtp.gmail.com with ESMTPSA id r196sm255902lfd.41.2016.09.07.12.52.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 12:52:22 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 7 Sep 2016 22:52:19 +0300 Message-Id: <1473277939-26074-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCHv2] linux-generic: make: fix distribution build for inlines.h 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Resolve bug https://bugs.linaro.org/show_bug.cgi?id=2507 by looking for the constructed file include/plat/inlines.h in the builddir, not the srcdir. Signed-off-by: Bill Fischofer --- platform/linux-generic/Makefile.am | 2 +- test/Makefile.inc | 4 +++- test/linux-generic/Makefile.inc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.5.0 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ae3cbba..92a0124 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -72,7 +72,7 @@ odpapiplatinclude_HEADERS = \ $(srcdir)/include/odp/api/plat/crypto_types.h \ $(srcdir)/include/odp/api/plat/event_types.h \ $(srcdir)/include/odp/api/plat/init_types.h \ - $(srcdir)/include/odp/api/plat/inlines.h \ + $(builddir)/include/odp/api/plat/inlines.h \ $(srcdir)/include/odp/api/plat/packet_types.h \ $(srcdir)/include/odp/api/plat/packet_io_types.h \ $(srcdir)/include/odp/api/plat/pool_types.h \ diff --git a/test/Makefile.inc b/test/Makefile.inc index 5def923..fcbedfa 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -9,7 +9,9 @@ LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCFLAGS = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/helper/include \ + -I$(top_builddir)/platform/@with_platform@/include + AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index b26324f..920daa9 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -13,4 +13,5 @@ INCODP = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/helper/include \ + -I$(top_builddir)/platform/@with_platform@/include