* [PATCH v2] iw: Makefile: support out-of-tree builds
@ 2026-04-29 21:08 Maxin John
2026-05-05 10:35 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Maxin John @ 2026-04-29 21:08 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes
Enable out-of-tree builds for external frameworks like OpenEmbedded,
so the build can run from a separate directory without changing the source tree.
Supports kernel-style out-of-tree builds using: make O=<builddir>
Signed-off-by: Maxin John <maxin.john@gmail.com>
---
Changes in v2:
- Add support for kernel-style out-of-tree builds using:
make O=<builddir>
- Make SRCDIR computation whitespace-safe by switching to realpath
- Remove ambiguous use of "-I." from CPPFLAGS
---
Makefile | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 2652fac4e6ee..91961650269d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,29 @@
MAKEFLAGS += --no-print-directory
+# Support building in a separate output directory (O): 'make O=<builddir>'
+SRCDIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+
+ifneq ($(O),)
+$(shell mkdir -p "$(O)")
+BUILDDIR := $(realpath $(O))
+$(if $(BUILDDIR),,$(error failed to create output directory "$(O)"))
+endif
+
+ifneq ($(words $(subst :, ,$(SRCDIR))),1)
+$(error source path cannot contain spaces or colons: $(SRCDIR))
+endif
+
+ifneq ($(O),)
+_goals := $(or $(MAKECMDGOALS),all)
+.PHONY: sub-make $(_goals)
+$(_goals): sub-make
+ @:
+sub-make:
+ +@$(MAKE) -C $(BUILDDIR) -f $(SRCDIR)/Makefile O= $(_goals)
+else
+VPATH := $(SRCDIR)
+.PHONY: all check clean install
+
PREFIX ?= /usr
SBINDIR ?= $(PREFIX)/sbin
MANDIR ?= $(PREFIX)/share/man
@@ -20,8 +44,9 @@ CFLAGS += -Wdeclaration-after-statement
CFLAGS += -D__SANE_USERSPACE_TYPES__
CFLAGS += $(CFLAGS_EVAL)
CFLAGS += $(EXTRA_CFLAGS)
+CPPFLAGS += -I$(CURDIR) -I$(SRCDIR)
-_OBJS := $(sort $(patsubst %.c,%.o,$(wildcard *.c)))
+_OBJS := $(sort $(patsubst $(SRCDIR)/%.c,%.o,$(wildcard $(SRCDIR)/*.c)))
VERSION_OBJS := $(filter-out version.o, $(_OBJS))
OBJS := $(VERSION_OBJS) version.o
@@ -93,13 +118,13 @@ endif
all: $(ALL)
version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
- $(wildcard .git/index .git/refs/tags)
+ $(wildcard $(SRCDIR)/.git/index $(SRCDIR)/.git/refs/tags)
@$(NQ) ' GEN ' $@
- $(Q)./version.sh $@
+ $(Q)$(SRCDIR)/version.sh $@
-nl80211-commands.inc: nl80211.h
+nl80211-commands.inc: $(SRCDIR)/nl80211.h
@$(NQ) ' GEN ' $@
- $(Q)sed 's%^\tNL80211_CMD_%%;t n;d;:n s%^\([^=]*\),.*%\t[NL80211_CMD_\1] = \"\L\1\",%;t;d' nl80211.h | grep -v "reserved" > $@
+ $(Q)sed 's%^\tNL80211_CMD_%%;t n;d;:n s%^\([^=]*\),.*%\t[NL80211_CMD_\1] = \"\L\1\",%;t;d' $< | grep -v "reserved" > $@
%.o: %.c iw.h nl80211.h nl80211-commands.inc
@$(NQ) ' CC ' $@
@@ -112,7 +137,7 @@ iw: $(OBJS)
endif
check:
- $(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
+ $(Q)$(MAKE) -f $(SRCDIR)/Makefile all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
%.gz: %
@$(NQ) ' GZIP' $<
@@ -128,3 +153,4 @@ install: iw iw.8.gz
clean:
$(Q)rm -f iw *.o *~ *.gz version.c *-stamp nl80211-commands.inc
+endif
--
2.47.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] iw: Makefile: support out-of-tree builds
2026-04-29 21:08 [PATCH v2] iw: Makefile: support out-of-tree builds Maxin John
@ 2026-05-05 10:35 ` Johannes Berg
2026-05-06 20:23 ` Maxin John
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2026-05-05 10:35 UTC (permalink / raw)
To: Maxin John, linux-wireless
On Thu, 2026-04-30 at 00:08 +0300, Maxin John wrote:
> - Add support for kernel-style out-of-tree builds using:
> make O=<builddir>
> - Make SRCDIR computation whitespace-safe by switching to realpath
> - Remove ambiguous use of "-I." from CPPFLAGS
Thanks for fixing that.
Right now I don't really see _why_ it doesn't work, but it seems
confusing that if you build in-tree first and then try to build out-of-
tree, it just says
make[1]: Nothing to be done for 'all'.
Maybe that should abort? Or work?
It seems that removing VPATH and changing the %.o rule
-%.o: %.c iw.h nl80211.h nl80211-commands.inc
+%.o: $(SRCDIR)/%.c $(SRCDIR)/iw.h $(SRCDIR)/nl80211.h nl80211-commands.inc
makes that work?
I'll leave it to you though.
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] iw: Makefile: support out-of-tree builds
2026-05-05 10:35 ` Johannes Berg
@ 2026-05-06 20:23 ` Maxin John
0 siblings, 0 replies; 3+ messages in thread
From: Maxin John @ 2026-05-06 20:23 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
Hi,
On Tue, May 05, 2026 at 12:35:16PM +0200, Johannes Berg wrote:
> On Thu, 2026-04-30 at 00:08 +0300, Maxin John wrote:
>
>
> > - Add support for kernel-style out-of-tree builds using:
> > make O=<builddir>
> > - Make SRCDIR computation whitespace-safe by switching to realpath
> > - Remove ambiguous use of "-I." from CPPFLAGS
>
> Thanks for fixing that.
>
> Right now I don't really see _why_ it doesn't work, but it seems
> confusing that if you build in-tree first and then try to build out-of-
> tree, it just says
>
> make[1]: Nothing to be done for 'all'.
>
> Maybe that should abort? Or work?
Thanks for sharing this observation. Yes, this is not ideal. I will update that
part based on your suggestion.
> It seems that removing VPATH and changing the %.o rule
>
> -%.o: %.c iw.h nl80211.h nl80211-commands.inc
> +%.o: $(SRCDIR)/%.c $(SRCDIR)/iw.h $(SRCDIR)/nl80211.h nl80211-commands.inc
>
> makes that work?
>
> I'll leave it to you though.
I will send a v3 to fix it.
> johannes
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-05-06 20:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-29 21:08 [PATCH v2] iw: Makefile: support out-of-tree builds Maxin John
2026-05-05 10:35 ` Johannes Berg
2026-05-06 20:23 ` Maxin John
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox