[v6,08/15] build: add .config file to dependencies

Message ID	1600421070-Icb541578dbe07c07f8e53407e92e0ce272c94e29@changeid
State	Superseded
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Johannes Berg <johannes@sipsolutions.net> To: hostap@lists.infradead.org Subject: [PATCH v6 08/15] build: add .config file to dependencies Date: Fri, 18 Sep 2020 11:24:54 +0200 Message-Id: <1600421070-Icb541578dbe07c07f8e53407e92e0ce272c94e29@changeid> In-Reply-To: <20200918092501.14821-1-johannes@sipsolutions.net> References: <20200918092501.14821-1-johannes@sipsolutions.net> MIME-Version: 1.0 summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS Precedence: list Cc: Johannes Berg <johannes.berg@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	build improvements \| expand [v6,00/15] build improvements [v6,01/15] hs20: server: add a .gitignore file [v6,02/15] build: pull common fragments into a common.rules file [v6,03/15] build: disable built-in rules [v6,04/15] build: use common.rules in lib.rules [v6,05/15] build: add a common-clean target [v6,06/15] build: move config file handling into build.rules [v6,07/15] build: put object files into build/ folder [v6,08/15] build: add .config file to dependencies [v6,09/15] build: remove hostapd vs. wpa_s build checks [v6,10/15] tests: rewrite .gitignore file [v6,11/15] build: use the new build system for fuzz tests [v6,12/15] tests: use new build system for the tests [v6,13/15] build: put archive files into build/ folder too [v6,14/15] build: allow overriding BUILDDIR from command line [v6,15/15] gitignore: add various things

Message ID

1600421070-Icb541578dbe07c07f8e53407e92e0ce272c94e29@changeid

State

Superseded

Headers

From: Johannes Berg <johannes@sipsolutions.net>
To: hostap@lists.infradead.org
Subject: [PATCH v6 08/15] build: add .config file to dependencies
Date: Fri, 18 Sep 2020 11:24:54 +0200
Message-Id: <1600421070-Icb541578dbe07c07f8e53407e92e0ce272c94e29@changeid>
In-Reply-To: <20200918092501.14821-1-johannes@sipsolutions.net>
References: <20200918092501.14821-1-johannes@sipsolutions.net>
MIME-Version: 1.0
Precedence: list
Cc: Johannes Berg <johannes.berg@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Hostap" <hostap-bounces@lists.infradead.org>
Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

build improvements | expand

Commit Message

Johannes Berg Sept. 18, 2020, 9:24 a.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

If the .config file changes, basically everything needs to be
rebuilt since we don't try to detect which symbols changed or
such. Now that the .config file handling is in the common
build system, make everything depend on it if there's one.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 src/build.rules         | 4 ++--
 wpa_supplicant/Makefile | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/build.rules b/src/build.rules
index 4b04eca58cf6..bdcae65519cf 100644
--- a/src/build.rules
+++ b/src/build.rules
@@ -76,10 +76,10 @@  _DIRS := $(BUILDDIR)/$(PROJ)
 _make_dirs:
 	@mkdir -p $(_DIRS)
 
-$(BUILDDIR)/$(PROJ)/src/%.o: $(ROOTDIR)src/%.c | _make_dirs
+$(BUILDDIR)/$(PROJ)/src/%.o: $(ROOTDIR)src/%.c $(CONFIG_FILE) | _make_dirs
 	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
 	@$(E) "  CC " $<
-$(BUILDDIR)/$(PROJ)/%.o: %.c | _make_dirs
+$(BUILDDIR)/$(PROJ)/%.o: %.c $(CONFIG_FILE) | _make_dirs
 	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
 	@$(E) "  CC " $<
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 9f81addd8228..c858f43b5909 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1866,8 +1866,6 @@  wpa_priv: $(BCHECK) $(OBJS_priv)
 	$(Q)$(LDO) $(LDFLAGS) -o wpa_priv $(OBJS_priv) $(LIBS)
 	@$(E) "  LD " $@
 
-$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
-
 _OBJS_VAR := OBJS
 include ../src/objs.mk
 wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)

[v6,08/15] build: add .config file to dependencies

Commit Message

Patch