From patchwork Tue Oct 25 13:57:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 79183 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3128016qge; Tue, 25 Oct 2016 06:58:25 -0700 (PDT) X-Received: by 10.237.32.65 with SMTP id 59mr20396191qta.33.1477403905911; Tue, 25 Oct 2016 06:58:25 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h204si8325241qke.43.2016.10.25.06.58.25; Tue, 25 Oct 2016 06:58:25 -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 B00FE6064E; Tue, 25 Oct 2016 13:57:54 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 C4D5E60965; Tue, 25 Oct 2016 13:57:49 +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 09C5560D5B; Tue, 25 Oct 2016 13:57:40 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 2D54660965 for ; Tue, 25 Oct 2016 13:57:36 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id t133so15011945lff.6 for ; Tue, 25 Oct 2016 06:57:36 -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=4nIT053Y3OVt54G/+wrsxL3lCdVYPJhopYDH+99ORys=; b=PU5Nx4qmzGQ6RNNztJyh00Im8NghBSHVYGJ+uXkgefUykN/ba8T7+O5ANNZ9u7nhE/ blf7cszZikPgYxgKRdprxETZk0bf/8Q7oP5hnKyaWH8XacoYcDiYS7YHUJJKQ+3OY3li 7VISOQLTsTt5dMWC/OxdiKeIFGhAjwlmtyV0OwI9QIdxw+M9xUZDzXV5bDY1Gl00HT8E /1joEf31ejWFySdEhuy1bG+isVBD46D68oESdBFb8bXWIOfArlAJN83biD7N2A44sbM/ QB7/e8VQ7pSURRsD0HiLqaoBSREE7XLU0eOFmzFOmVDrmN451iRa+bClrqtW5VOWSCI7 5n7g== X-Gm-Message-State: ABUngvef9s38cAI8xNUdCQMmwfJiGenUjvqdZ+Sy/fgJrUhbf2zULIER0c430sr4NNopRcP39vo= X-Received: by 10.25.198.83 with SMTP id w80mr10979936lff.164.1477403854886; Tue, 25 Oct 2016 06:57:34 -0700 (PDT) Received: from localhost.localdomain (ppp46-138-205-38.pppoe.spdop.ru. [46.138.205.38]) by smtp.gmail.com with ESMTPSA id i136sm3938318lfg.36.2016.10.25.06.57.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 06:57:34 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 25 Oct 2016 16:57:14 +0300 Message-Id: <1477403834-10983-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 X-Topics: patch Subject: [lng-odp] [PATCH] 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 --- example/Makefile.inc | 3 ++- helper/Makefile.am | 1 + platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 1 + test/Makefile.inc | 3 ++- 5 files changed, 8 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)