diff mbox series

build: wpa_s: put common EAP objs into OBJS

Message ID 1602756806-I230fd2c6b47e826bad5193630073dcd66d0323c6@changeid
State Superseded
Headers show
Series build: wpa_s: put common EAP objs into OBJS | expand

Commit Message

Johannes Berg Oct. 15, 2020, 10:13 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Just building them (on disk) and not linking them anywhere
doesn't seem like it would do the right thing, and fails
after the rebuild since nothing knows how to build those
.o files.

Build them into the supplicant binary itself by adding them
to OBJS so that they can be used by dynamically loaded EAP
method.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 wpa_supplicant/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 9adadf141e67..654af3ef39f2 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -646,12 +646,11 @@  ifdef CONFIG_EAP_FAST
 ifeq ($(CONFIG_EAP_FAST), dyn)
 CFLAGS += -DEAP_FAST_DYNAMIC
 EAPDYN += ../src/eap_peer/eap_fast.so
-EAPDYN += ../src/eap_common/eap_fast_common.o
 else
 CFLAGS += -DEAP_FAST
 OBJS += ../src/eap_peer/eap_fast.o ../src/eap_peer/eap_fast_pac.o
-OBJS += ../src/eap_common/eap_fast_common.o
 endif
+OBJS += ../src/eap_common/eap_fast_common.o
 TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
 NEED_T_PRF=y
@@ -662,12 +661,11 @@  ifdef CONFIG_EAP_TEAP
 ifeq ($(CONFIG_EAP_TEAP), dyn)
 CFLAGS += -DEAP_TEAP_DYNAMIC
 EAPDYN += ../src/eap_peer/eap_teap.so
-EAPDYN += ../src/eap_common/eap_teap_common.o
 else
 CFLAGS += -DEAP_TEAP
 OBJS += ../src/eap_peer/eap_teap.o ../src/eap_peer/eap_teap_pac.o
-OBJS += ../src/eap_common/eap_teap_common.o
 endif
+OBJS += ../src/eap_common/eap_teap_common.o
 TLS_FUNCS=y
 CONFIG_IEEE8021X_EAPOL=y
 NEED_T_PRF=y
@@ -811,12 +809,11 @@  ifdef CONFIG_EAP_IKEV2
 ifeq ($(CONFIG_EAP_IKEV2), dyn)
 CFLAGS += -DEAP_IKEV2_DYNAMIC
 EAPDYN += ../src/eap_peer/eap_ikev2.so ../src/eap_peer/ikev2.o
-EAPDYN += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
 else
 CFLAGS += -DEAP_IKEV2
 OBJS += ../src/eap_peer/eap_ikev2.o ../src/eap_peer/ikev2.o
-OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
 endif
+OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
 CONFIG_IEEE8021X_EAPOL=y
 NEED_DH_GROUPS=y
 NEED_DH_GROUPS_ALL=y