diff mbox series

[v3,9/9] build: remove hostapd vs. wpa_s build checks

Message ID 1598866005-Ib638eab7ed9b579f8c79c20b4c043cc7436b94ca@changeid
State Superseded
Headers show
Series build improvements | expand

Commit Message

Johannes Berg Aug. 31, 2020, 9:29 a.m. UTC
From: Johannes Berg <johannes.berg@intel.com>

These are no longer needed now. Note that this was never
actually sufficient since src/drivers/ isn't the only
thing shared, and thus a cross-build didn't work.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 hostapd/Makefile        | 10 +---------
 wpa_supplicant/Makefile | 14 +++-----------
 2 files changed, 4 insertions(+), 20 deletions(-)
diff mbox series

Patch

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 4c59ca77a243..9f9dfda17245 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -1264,17 +1264,9 @@  $(DESTDIR)$(BINDIR)/%: %
 
 install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
 
-../src/drivers/build.hostapd:
-	@if [ -f ../src/drivers/build.wpa_supplicant ]; then \
-		$(MAKE) -C ../src/drivers clean; \
-	fi
-	@touch ../src/drivers/build.hostapd
-
-BCHECK=../src/drivers/build.hostapd
-
 $(call BUILDOBJS,OBJS)
 
-hostapd: $(BCHECK) $(OBJS)
+hostapd: $(OBJS)
 	$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
 	@$(E) "  LD " $@
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 1e99ccfd94f7..9697e461914b 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1852,23 +1852,15 @@  endif
 
 dynamic_eap_methods: $(EAPDYN)
 
-../src/drivers/build.wpa_supplicant:
-	@if [ -f ../src/drivers/build.hostapd ]; then \
-		$(MAKE) -C ../src/drivers clean; \
-	fi
-	@touch ../src/drivers/build.wpa_supplicant
-
-BCHECK=../src/drivers/build.wpa_supplicant
-
 $(call BUILDOBJS,OBJS_priv)
-wpa_priv: $(BCHECK) $(OBJS_priv)
+wpa_priv: $(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_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(EXTRA_progs): .config
 
 $(call BUILDOBJS,OBJS)
-wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
+wpa_supplicant: $(OBJS) $(EXTRA_progs)
 	$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
 	@$(E) "  LD " $@