From patchwork Thu Sep 8 13:00:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 75790 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp831172qgf; Thu, 8 Sep 2016 06:01:10 -0700 (PDT) X-Received: by 10.200.54.106 with SMTP id n39mr991378qtb.134.1473339669934; Thu, 08 Sep 2016 06:01:09 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c23si21844731qkh.324.2016.09.08.06.01.09; Thu, 08 Sep 2016 06:01:09 -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 694ED60F54; Thu, 8 Sep 2016 13:01:09 +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 9BB0D60D4E; Thu, 8 Sep 2016 13:01:02 +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 B67BB60E67; Thu, 8 Sep 2016 13:00:57 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id 363FE60D43 for ; Thu, 8 Sep 2016 13:00:43 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id h127so20878262lfh.0 for ; Thu, 08 Sep 2016 06:00:43 -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=9h8gjUwGEXjZqe54lMRVTQ/kRb3b6IKto2qVp5YINk0=; b=NXf6uH/P9USshoCMx7oibnCFUcqDdP48yJ3Aycvnpv5wn1Vn5xY81H03FRi0ciQ/0Q d2y7wZDH4qPLK0JdgJQx9wBLL3CpHPKPpEsiu5jBKm0p1sNzvxDki+KPdggkSYD2c0x9 HA9PNRNLbN52Ly5U84RhHkyfPimN+Vub4k+HBbZU8iTKiyDO/IizRCDSLaV8D9FtKGuX Lo38vAbBIsttna7F3ZySYF4VHCoLW4UmrCC5isfnWdIgDb6gN2Z0E0jtlP43g/lnnL6X tLzWcsJrAkird5afAZ+9+12EZxa/Sek1LVVYV1b/0UXGluPCd/lpn2QWjCZdaB7M0lzg UslQ== X-Gm-Message-State: AE9vXwM+OzH5s6x+DsvYksEOipfEKKdjxb76Hw3hq93/Sk1PbrFpvLRvKBCnGFs6iQIzG6s8Tbc= X-Received: by 10.25.10.2 with SMTP id 2mr1706498lfk.47.1473339641962; Thu, 08 Sep 2016 06:00:41 -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 98sm668882ljb.19.2016.09.08.06.00.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 06:00:41 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Thu, 8 Sep 2016 16:00:39 +0300 Message-Id: <1473339639-7840-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCHv4] 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 | 9 ++++++--- test/linux-generic/Makefile.inc | 10 ++++++---- 3 files changed, 13 insertions(+), 8 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..db5a2fa 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -6,10 +6,13 @@ LIB = $(top_builddir)/lib #before libodp by setting PRE_LDADD before the inclusion. LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -INCFLAGS = -I$(top_srcdir)/test \ - -I$(top_srcdir)/platform/@with_platform@/include \ +INCFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/test + AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index b26324f..eba1d2d 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -9,8 +9,10 @@ LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common -INCODP = -I$(top_srcdir)/test \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ +INCODP = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/test