From patchwork Mon May 5 16:23:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 29660 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C0802055D for ; Mon, 5 May 2014 16:24:03 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf40860567oah.1 for ; Mon, 05 May 2014 09:24:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=UARXEYHcih4ZpnQvyeIgFjBEZkqOsIM/KU7Clh6EHhg=; b=ViF/u/WMRy+71qXkeyS/L2qE9SOrNDNKPAryanq6w00FAmqMA1c9sAm7e5mZNQ1DhP IMzA+d5L0G4DUZaZimJXZ4lGsPGiHPBpOZBNaSIzfcC0aou78RNxFW4KMFcUapizj6C5 18LDJ6sgWXXB9GWVq/59wMvzQKJAcmYyfo3CAMJT+TxOUq7lzu/JYvznh4AkEJyThIbO GMmQGVicvXGqhWI88Uhna3VpYLNQ7URTihlqq892IXNvb7EQnF/IRJIZqENHWW42YoUJ Rb10NdKuKfFMXGhZgHFQcikXpm46ossdW/gTWJW+rVE5AVr0My08mRKWIHpqSYUV5Taq sv4Q== X-Gm-Message-State: ALoCoQk9pfbCyhb8xDTsDyg5ImJYcG7U9ady+M8w4jAYY8t3ogtRnx4831D3/BDCIqIH2UpuIC8M X-Received: by 10.182.252.166 with SMTP id zt6mr17338374obc.17.1399307042688; Mon, 05 May 2014 09:24:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.4 with SMTP id t4ls2537054qge.1.gmail; Mon, 05 May 2014 09:24:02 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr28961749vcy.8.1399307042526; Mon, 05 May 2014 09:24:02 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id cm9si1702431vcb.154.2014.05.05.09.24.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 09:24:02 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id db11so4301403veb.15 for ; Mon, 05 May 2014 09:24:02 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr28625904vec.15.1399307042387; Mon, 05 May 2014 09:24:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp153499vcb; Mon, 5 May 2014 09:24:01 -0700 (PDT) X-Received: by 10.140.50.230 with SMTP id s93mr42758765qga.33.1399307041686; Mon, 05 May 2014 09:24:01 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id e4si560907qcc.11.2014.05.05.09.23.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 05 May 2014 09:24:01 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1WhLfj-0007gB-QL; Mon, 05 May 2014 16:23:19 +0000 Received: from mail-la0-f42.google.com ([209.85.215.42]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1WhLfd-0007g6-4U for lng-odp@lists.linaro.org; Mon, 05 May 2014 16:23:13 +0000 Received: by mail-la0-f42.google.com with SMTP id pn19so1508516lab.1 for ; Mon, 05 May 2014 09:23:45 -0700 (PDT) X-Received: by 10.152.29.8 with SMTP id f8mr13062179lah.11.1399307025080; Mon, 05 May 2014 09:23:45 -0700 (PDT) Received: from uglx0153363.itg.ti.com ([195.238.92.128]) by mx.google.com with ESMTPSA id ap4sm8698948lac.15.2014.05.05.09.23.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 09:23:40 -0700 (PDT) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Mon, 5 May 2014 19:23:27 +0300 Message-Id: <1399307007-15617-1-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Topics: patch Subject: [lng-odp] [PATCH] tests: Do not use platform include files directly X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Applications must not refer to includes in platform directory. Instead they shall use headers from DESTDIR. Signed-off-by: Taras Kondratiuk --- Makefile | 3 +-- Makefile.inc | 1 + test/Makefile.inc | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2512343..7d10fd5 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,8 @@ .DEFAULT_GOAL := default -ODP_ROOT = $(PWD) +ODP_ROOT = $(CURDIR) ODP_TESTS = $(ODP_ROOT)/test -export DESTDIR = $(ODP_ROOT)/build include $(ODP_ROOT)/Makefile.inc diff --git a/Makefile.inc b/Makefile.inc index a5aeb8b..d725137 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -7,6 +7,7 @@ PLATFORM ?= linux-generic OBJ_DIR = ./obj ODP_DIR = $(ODP_ROOT)/platform/$(PLATFORM) +export DESTDIR = $(ODP_ROOT)/build CC ?= gcc LD ?= gcc diff --git a/test/Makefile.inc b/test/Makefile.inc index f001119..b732c56 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -3,19 +3,10 @@ # # SPDX-License-Identifier: BSD-3-Clause -ifdef DESTDIR - ODP_LIB = $(DESTDIR)/lib/libodp.a EXTRA_CFLAGS += -I$(DESTDIR)/include EXTRA_CFLAGS += -I$(DESTDIR)/include/api -else - -ODP_LIB = $(ODP_DIR)/lib/libodp.a -EXTRA_CFLAGS += -I$(ODP_ROOT)/include -EXTRA_CFLAGS += -I$(ODP_DIR)/include/api - $(ODP_LIB): @echo Building $@ - $(MAKE) -C $(ODP_DIR) libs -endif + $(MAKE) -C $(ODP_ROOT) libs_install