1*4882a593SmuzhiyunFrom ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Changhyeok Bae <changhyeok.bae@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 27 Jan 2020 22:48:03 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Support separation of SRCDIR and OBJDIR 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunTypical use of VPATH to locate the sources. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Pending 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Christopher Larson <chris_larson@mentor.com> 11*4882a593SmuzhiyunSigned-off-by: Maxin B. John <maxin.john@intel.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun Makefile | 8 ++++++-- 14*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 2 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/Makefile b/Makefile 17*4882a593Smuzhiyunindex 90f2251..714cdb9 100644 18*4882a593Smuzhiyun--- a/Makefile 19*4882a593Smuzhiyun+++ b/Makefile 20*4882a593Smuzhiyun@@ -1,5 +1,9 @@ 21*4882a593Smuzhiyun MAKEFLAGS += --no-print-directory 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun+SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) 24*4882a593Smuzhiyun+OBJDIR ?= $(PWD) 25*4882a593Smuzhiyun+VPATH = $(SRCDIR) 26*4882a593Smuzhiyun+ 27*4882a593Smuzhiyun PREFIX ?= /usr 28*4882a593Smuzhiyun SBINDIR ?= $(PREFIX)/sbin 29*4882a593Smuzhiyun MANDIR ?= $(PREFIX)/share/man 30*4882a593Smuzhiyun@@ -92,7 +96,7 @@ all: $(ALL) 31*4882a593Smuzhiyun version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ 32*4882a593Smuzhiyun $(wildcard .git/index .git/refs/tags) 33*4882a593Smuzhiyun @$(NQ) ' GEN ' $@ 34*4882a593Smuzhiyun- $(Q)./version.sh $@ 35*4882a593Smuzhiyun+ $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun nl80211-commands.inc: nl80211.h 38*4882a593Smuzhiyun @$(NQ) ' GEN ' $@ 39*4882a593Smuzhiyun@@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun %.o: %.c iw.h nl80211.h nl80211-commands.inc 42*4882a593Smuzhiyun @$(NQ) ' CC ' $@ 43*4882a593Smuzhiyun- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< 44*4882a593Smuzhiyun+ $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun ifeq ($(IW_ANDROID_BUILD),) 47*4882a593Smuzhiyun iw: $(OBJS) 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.23.0 50*4882a593Smuzhiyun 51