From patchwork Wed Sep 7 20:29:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 75690 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp503385qgf; Wed, 7 Sep 2016 13:29:17 -0700 (PDT) X-Received: by 10.200.49.220 with SMTP id i28mr28108709qte.36.1473280157068; Wed, 07 Sep 2016 13:29:17 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w4si26255826qkd.18.2016.09.07.13.29.16; Wed, 07 Sep 2016 13:29:17 -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 31E1C616C7; Wed, 7 Sep 2016 20:29:16 +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 093E360F03; Wed, 7 Sep 2016 20:29:12 +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 5D71A616C1; Wed, 7 Sep 2016 20:29:10 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 4158560F02 for ; Wed, 7 Sep 2016 20:29:08 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id u14so6836352lfd.1 for ; Wed, 07 Sep 2016 13:29:08 -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=t3CjnGbgysIfPvQl0DX6IKa7hOwH9F7/a0M3CsK7+/E=; b=HJ4Ua+pkvKwuh/quk9aYMCdxxcLrCdXVyz4fGSksdLA1lr6MnCvjTpDgFx7J3zka+P nc67/tfkvsjhMNolkU3hAYA1XUKpal7P606ve+lFqLdVwr0YIWi4slIwhLmLCh4o3FC4 MT10syJX9fco7xgRTlW811JMUDs0F+48IvEPW5A/iMWr7P8qcNz27TWA32r6BlmavKmT G+JTXmDr4hzaC2PYC8iJgtCNG5CRF5eFrLMcwiG23NBhcbrSO9V1h3FUs984YnRZsIuP UM/5e6/GH4r81KRhsnrqLVGt8Bxq1JQdk4GtK5YqFR79tEvvZz//RyoSu5YOQi8TmOBJ YoeA== X-Gm-Message-State: AE9vXwP02IMTl3Fpgh4cl0y1phtSckZQFsTcQL5jv8ANviStCtNCR8TMKTTAEfK2B34h7OGsq8I= X-Received: by 10.25.76.5 with SMTP id z5mr424980lfa.118.1473280146724; Wed, 07 Sep 2016 13:29:06 -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 s70sm292262lfi.23.2016.09.07.13.29.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 13:29:06 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 7 Sep 2016 23:29:04 +0300 Message-Id: <1473280144-5684-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCHv3] 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..e3c0f56 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -61,6 +61,7 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ + $(builddir)/include/odp/api/plat/inlines.h \ $(srcdir)/include/odp/api/plat/atomic_inlines.h \ $(srcdir)/include/odp/api/plat/atomic_types.h \ $(srcdir)/include/odp/api/plat/barrier_types.h \ @@ -72,7 +73,6 @@ 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 \ $(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