From patchwork Tue Oct 25 20:28:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 79274 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp59452qge; Tue, 25 Oct 2016 13:29:05 -0700 (PDT) X-Received: by 10.176.1.65 with SMTP id 59mr16241313uak.170.1477427345582; Tue, 25 Oct 2016 13:29:05 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 62si9958083uav.1.2016.10.25.13.29.05; Tue, 25 Oct 2016 13:29:05 -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 E517460F2E; Tue, 25 Oct 2016 20:29:04 +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 0185960A33; Tue, 25 Oct 2016 20:28:55 +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 8390460A3F; Tue, 25 Oct 2016 20:28:48 +0000 (UTC) Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com [209.85.215.50]) by lists.linaro.org (Postfix) with ESMTPS id C79E360A33 for ; Tue, 25 Oct 2016 20:28:43 +0000 (UTC) Received: by mail-lf0-f50.google.com with SMTP id d20so20666011lfj.5 for ; Tue, 25 Oct 2016 13:28: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=IBzUCuMKQaObYmDeQAafYXxDbftDXW40bZ9Zsx5Me7g=; b=mMLqQpJVLg7wpbVyiVbg9LyNa0S77DqHkSPzuDVX7f9MJaBnB0jsGhfDrwhglsh5Kv unZcuenDVLAT/FKfhA5hMAh/9Fv8PvpsQMOWJgr4Zb68vajGCVZujIYQtel64vM3S0gU hNxn9bigWgNXNh07Z1MWUZX+/Q0ucPcmCHqhjnodgy0wXWqwGsmSHhKat5vUZyLf/KpG duUjTPDE/D+BVMM53zMmO6bgJz9pKnW8HC6Gfr6O6BdDYGFjPoxLmonvTDjDR3DLkQtz HSYS0Iph7nz7DamCdDdpHuwzB6RSivkbRrNp7NIjH45eK2YNsO6Y+VF+byGnzOw2q7os BsBw== X-Gm-Message-State: ABUngvd5r+NavrqS4RjRw5hHtkKGRTfs4EH3+FwlVlLeFD7Ci+pCux6AKfzLqES6OGKIlL8vKmw= X-Received: by 10.25.35.6 with SMTP id j6mr12041918lfj.147.1477427322176; Tue, 25 Oct 2016 13:28:42 -0700 (PDT) Received: from localhost.localdomain (ppp46-138-205-38.pppoe.spdop.ru. [46.138.205.38]) by smtp.gmail.com with ESMTPSA id f198sm4239301lfe.10.2016.10.25.13.28.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 13:28:41 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 25 Oct 2016 23:28:22 +0300 Message-Id: <1477427302-8112-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 X-Topics: patch Subject: [lng-odp] [PATCHv2] fix out of tree build 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" Commit: eebd6b0 configure: the version cannot use a script Did generation of version.h which is done in $dest_dir. Includes paths have to be corrected accordingly. Signed-off-by: Maxim Uvarov --- v2: build.sh in some combination did not pass on v1, fix it (Mike). example/Makefile.inc | 3 ++- helper/Makefile.am | 1 + platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 1 + test/Makefile.inc | 3 ++- test/linux-generic/Makefile.inc | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) -- 2.7.1.250.gff4ea60 diff --git a/example/Makefile.inc b/example/Makefile.inc index 9fb2f29..19d3994 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -7,6 +7,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/helper/include \ - -I$(top_builddir)/platform/@with_platform@/include + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index b6e6a1d..d09d900 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS = -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 432d1fd..2722946 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -57,8 +57,8 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_srcdir)/include/odp/api/spec/version.h + $(top_builddir)/include/odp/api/spec/version.h \ + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0ec13d4..22cf6f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude include_HEADERS = \ diff --git a/test/Makefile.inc b/test/Makefile.inc index db5a2fa..1ebc047 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -11,7 +11,8 @@ INCFLAGS = \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test + -I$(top_srcdir)/test \ + -I$(top_builddir)/include AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index eba1d2d..36745fe 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -10,6 +10,7 @@ LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \ + -I$(top_builddir)/include \ -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \