Added a separate ctx pointer for wpa_msg() calls in WPA supp

[wpasupplicant] / wpa_supplicant / Makefile

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 02b28f6..65adf53 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -132,7 +132,7 @@ CFLAGS += -DCONFIG_DRIVER_NL80211
 OBJS_d += ../src/drivers/driver_nl80211.o
 LIBS += -lnl
 ifdef CONFIG_CLIENT_MLME
-OBJS_d += ../src/drivers/radiotap.o
+OBJS_d += ../src/utils/radiotap.o
 endif
 endif
 
@@ -434,6 +434,7 @@ CFLAGS += -DEAP_AKA_PRIME_DYNAMIC
 else
 CFLAGS += -DEAP_AKA_PRIME
 endif
+NEED_SHA256=y
 endif
 
 ifdef CONFIG_EAP_SIM_COMMON
@@ -524,6 +525,8 @@ OBJS_h += ../src/eap_server/eap_wsc.o
 endif
 CONFIG_IEEE8021X_EAPOL=y
 NEED_DH_GROUPS=y
+NEED_SHA256=y
+NEED_BASE64=y
 endif
 
 ifdef CONFIG_EAP_IKEV2
@@ -560,6 +563,8 @@ ifdef CONFIG_EAP_TNC
 CFLAGS += -DEAP_TNC
 OBJS += ../src/eap_peer/eap_tnc.o
 OBJS += ../src/eap_peer/tncc.o
+OBJS_h += ../src/eap_server/eap_tnc.o
+OBJS_h += ../src/eap_server/tncs.o
 NEED_BASE64=y
 endif
 
@@ -936,6 +941,21 @@ else
 CFLAGS += -DCONFIG_NO_WPA -DCONFIG_NO_WPA2
 endif
 
+ifdef CONFIG_IBSS_RSN
+CFLAGS += -DCONFIG_IBSS_RSN
+OBJS += ibss_rsn.o
+OBJS += ../hostapd/wpa.o
+OBJS += ../hostapd/wpa_auth_ie.o
+OBJS += ../hostapd/pmksa_cache.o
+OBJS += ../src/radius/radius.o
+ifdef CONFIG_IEEE80211R
+OBJS += ../hostapd/wpa_ft.o
+endif
+ifdef CONFIG_PEERKEY
+OBJS += ../hostapd/peerkey.o
+endif
+endif
+
 ifdef CONFIG_NO_WPA2
 CFLAGS += -DCONFIG_NO_WPA2
 endif
@@ -1221,16 +1241,10 @@ docs: docs-pics
        cp doc/latex/refman.pdf wpa_supplicant-devel.pdf
 
 docs-fast: docs-pics
-       doxygen doc/doxygen.fast
+       (cd ..; doxygen wpa_supplicant/doc/doxygen.fast; cd wpa_supplicant)
 
 clean-docs:
        rm -rf doc/latex doc/html
        rm -f doc/wpa_supplicant.{eps,png} wpa_supplicant-devel.pdf
 
-wpa_supplicant-sparse: .config $(OBJS)
-       @echo Sparse run completed
-
-run-sparse:
-       CC="sparse -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -D__INT_MAX__=2147483647 -D__SHRT_MAX__=32767 -D__LONG_MAX__=2147483647 -D__SCHAR_MAX__=127 -Wbitwise" $(MAKE) wpa_supplicant-sparse
-
 -include $(OBJS:%.o=%.d)