From patchwork Thu Apr 6 19:07:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 9668129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF458602B3 for ; Thu, 6 Apr 2017 19:07:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2A75285C4 for ; Thu, 6 Apr 2017 19:07:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7296285D5; Thu, 6 Apr 2017 19:07:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F466285C4 for ; Thu, 6 Apr 2017 19:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238AbdDFTHq (ORCPT ); Thu, 6 Apr 2017 15:07:46 -0400 Received: from mail-wr0-f182.google.com ([209.85.128.182]:36511 "EHLO mail-wr0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754962AbdDFTHk (ORCPT ); Thu, 6 Apr 2017 15:07:40 -0400 Received: by mail-wr0-f182.google.com with SMTP id c55so3242749wrc.3 for ; Thu, 06 Apr 2017 12:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/YyiGPPxifsbwEgSaulkAwLUpet+q9jjdMiVmTqB7iQ=; b=Gukgo38vA7VyIaocTkC6bDB+FlT2WRZ77boS46utU3IY/CkGVvRwqHpHEQep7tt82j 5mCagBH3DcHEdlosECjoSa/mWVBFcJprzysGxOpwgU9zN/mCWY761KgslUhHbq77xLOp 91TBuPZBOq/VI3q24GLLD1zqXxrpoABhsido0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/YyiGPPxifsbwEgSaulkAwLUpet+q9jjdMiVmTqB7iQ=; b=I5GiLQ18hg6nsYAi1v14TtoM6XLXjWiuduy2RIl43Kpotjv9k/p0cXrs8EpbQi9oYj +/RVjm9l5OExsmBHdiaDoaYu6POB8zsmTcHz7pl57XFQpywWio5SCgAOhomIoUHHzDZ5 ao27t7sMzEhPWeq9L/mwID4Gj3tXtM3IK//cqS4ghp7wfMT59ji5SUAtRaZTVzspkFaN pnHpAmoFTC5E1MqJaQfsBXpN/piqvi9uoH+LnfhNfE7+dUG6k6sYE9gM0Q+QxTFSgKNQ GNgg8Js2hlGJYuqhi2k3xxe3/ygN8hSkg+hVd1TcUSPM/xaonN9XOXZtjrgSJRsAaMF8 jCkw== X-Gm-Message-State: AFeK/H1ej3VRpJYN8iMRV14kbk6DP7SN5Zc+6m4DJilJ0FgVAxiCaP4H94sNfTW/Q2zJR2f2 X-Received: by 10.223.160.183 with SMTP id m52mr31592621wrm.201.1491505658149; Thu, 06 Apr 2017 12:07:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j138sm3472515wmg.10.2017.04.06.12.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 12:07:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 922E23E03B7; Thu, 6 Apr 2017 20:07:37 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: drjones@redhat.com, pbonzini@redhat.com Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC kvm-unit-tests PATCH 4/8] Makefiles: use explicit path for including sub-Makefiles Date: Thu, 6 Apr 2017 20:07:23 +0100 Message-Id: <20170406190727.5624-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170406190727.5624-1-alex.bennee@linaro.org> References: <20170406190727.5624-1-alex.bennee@linaro.org> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I would of thought VPATH took care of this but apparently not. Signed-off-by: Alex Bennée --- Makefile | 8 ++++---- arm/Makefile | 2 +- arm/Makefile.arm | 2 +- arm/Makefile.arm64 | 2 +- powerpc/Makefile | 2 +- powerpc/Makefile.ppc64 | 2 +- x86/Makefile | 2 +- x86/Makefile.i386 | 2 +- x86/Makefile.x86_64 | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 80bc57e..781186e 100644 --- a/Makefile +++ b/Makefile @@ -32,14 +32,14 @@ cflatobjs := \ lib/stack.o # libfdt paths -LIBFDT_objdir = lib/libfdt -LIBFDT_srcdir = lib/libfdt +LIBFDT_objdir = $(SRCDIR)/lib/libfdt +LIBFDT_srcdir = $(SRCDIR)/lib/libfdt LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) -#include architecure specific make rules -include $(TEST_DIR)/Makefile +#include architecture specific make rules +include $(SRCDIR)/$(TEST_DIR)/Makefile # cc-option # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0) diff --git a/arm/Makefile b/arm/Makefile index 369a38b..8a007ab 100644 --- a/arm/Makefile +++ b/arm/Makefile @@ -1 +1 @@ -include $(TEST_DIR)/Makefile.$(ARCH) +include $(SRCDIR)/$(TEST_DIR)/Makefile.$(ARCH) diff --git a/arm/Makefile.arm b/arm/Makefile.arm index 92f3757..6b57284 100644 --- a/arm/Makefile.arm +++ b/arm/Makefile.arm @@ -22,6 +22,6 @@ cflatobjs += lib/arm/stack.o # arm specific tests tests = -include $(TEST_DIR)/Makefile.common +include $(SRCDIR)/$(TEST_DIR)/Makefile.common arch_clean: arm_clean diff --git a/arm/Makefile.arm64 b/arm/Makefile.arm64 index 0b0761c..b5fc1ec 100644 --- a/arm/Makefile.arm64 +++ b/arm/Makefile.arm64 @@ -14,7 +14,7 @@ cflatobjs += lib/arm64/spinlock.o # arm64 specific tests tests = -include $(TEST_DIR)/Makefile.common +include $(SRCDIR)/$(TEST_DIR)/Makefile.common arch_clean: arm_clean $(RM) lib/arm64/.*.d diff --git a/powerpc/Makefile b/powerpc/Makefile index 369a38b..8a007ab 100644 --- a/powerpc/Makefile +++ b/powerpc/Makefile @@ -1 +1 @@ -include $(TEST_DIR)/Makefile.$(ARCH) +include $(SRCDIR)/$(TEST_DIR)/Makefile.$(ARCH) diff --git a/powerpc/Makefile.ppc64 b/powerpc/Makefile.ppc64 index 3da3a83..3c0294a 100644 --- a/powerpc/Makefile.ppc64 +++ b/powerpc/Makefile.ppc64 @@ -20,7 +20,7 @@ cflatobjs += lib/ppc64/spinlock.o # ppc64 specific tests tests = -include $(TEST_DIR)/Makefile.common +include $(SRCDIR)/$(TEST_DIR)/Makefile.common arch_clean: powerpc_clean $(RM) lib/ppc64/.*.d diff --git a/x86/Makefile b/x86/Makefile index 369a38b..8a007ab 100644 --- a/x86/Makefile +++ b/x86/Makefile @@ -1 +1 @@ -include $(TEST_DIR)/Makefile.$(ARCH) +include $(SRCDIR)/$(TEST_DIR)/Makefile.$(ARCH) diff --git a/x86/Makefile.i386 b/x86/Makefile.i386 index 284b9e5..d801b80 100644 --- a/x86/Makefile.i386 +++ b/x86/Makefile.i386 @@ -7,4 +7,4 @@ cflatobjs += lib/x86/setjmp32.o tests = $(TEST_DIR)/taskswitch.flat $(TEST_DIR)/taskswitch2.flat \ $(TEST_DIR)/cmpxchg8b.flat -include $(TEST_DIR)/Makefile.common +include $(SRCDIR)/$(TEST_DIR)/Makefile.common diff --git a/x86/Makefile.x86_64 b/x86/Makefile.x86_64 index 3e2821e..30f82a6 100644 --- a/x86/Makefile.x86_64 +++ b/x86/Makefile.x86_64 @@ -17,7 +17,7 @@ tests += $(TEST_DIR)/vmx.flat tests += $(TEST_DIR)/tscdeadline_latency.flat tests += $(TEST_DIR)/intel-iommu.flat -include $(TEST_DIR)/Makefile.common +include $(SRCDIR)/$(TEST_DIR)/Makefile.common $(TEST_DIR)/hyperv_clock.elf: $(TEST_DIR)/hyperv_clock.o