All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] kbuild: Use relative path when building in a subdir of the source tree
Date: Tue, 29 Apr 2014 16:08:13 +0200	[thread overview]
Message-ID: <1398780493-15391-6-git-send-email-mmarek@suse.cz> (raw)
In-Reply-To: <1398780493-15391-1-git-send-email-mmarek@suse.cz>

When doing make O=<subdir>, use '..' to refer to the source tree. This
allows for more readable compiler messages, and, more importantly, it
sets the VPATH to '..', so filenames in WARN_ON() etc. will be shorter.

Signed-off-by: Michal Marek <mmarek@suse.cz>
---
 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7ae9e9d..3d311b6 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,17 @@ else
 _all: modules
 endif
 
-srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),.)
+ifeq ($(KBUILD_SRC),)
+        # building in the source tree
+        srctree := .
+else
+        ifeq ($(KBUILD_SRC)/,$(dir $(CURDIR)))
+                # building in a subdirectory of the source tree
+                srctree := ..
+        else
+                srctree := $(KBUILD_SRC)
+        endif
+endif
 objtree		:= .
 src		:= $(srctree)
 obj		:= $(objtree)
-- 
1.9.2


  parent reply	other threads:[~2014-04-29 14:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-29 14:08 [PATCH 0/5] kbuild: Use relative paths if possible Michal Marek
2014-04-29 14:08 ` [PATCH 1/5] firmware: Simplify directory creation Michal Marek
2014-04-30 16:12   ` Sam Ravnborg
2014-05-05 14:52     ` Michal Marek
2014-04-29 14:08 ` [PATCH 2/5] firmware: Use $(quote) in the Makefile Michal Marek
2014-04-29 14:08 ` [PATCH 3/5] kbuild: Use relative path for $(objtree) Michal Marek
2014-04-29 14:08 ` [PATCH 4/5] kbuild: Use relative path when building in the source tree Michal Marek
2014-04-29 14:08 ` Michal Marek [this message]
2014-04-30 16:13 ` [PATCH 0/5] kbuild: Use relative paths if possible Sam Ravnborg
2014-05-05 14:52   ` Michal Marek
2014-05-08 20:44   ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398780493-15391-6-git-send-email-mmarek@suse.cz \
    --to=mmarek@suse.cz \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.