X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2FMakefile;h=8daae759176172aa52695f984f5e5c664eb0f9c1;hb=03da66bd59567c90dc3b3b0892c3346472a0b413;hp=43a54547353a4c4c9bbbc19d19539d581c8c4e8d;hpb=41fa8a892f97ef98987b12c1e639dc4dc72d8f16;p=libeap.git

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 43a5454..8daae75 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -10,10 +10,7 @@ export LIBDIR ?= /usr/local/lib/
 export BINDIR ?= /usr/local/sbin/
 
 CFLAGS += -I../src
-CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
-CFLAGS += -I../src/rsn_supp
 
 ALL=wpa_supplicant wpa_passphrase wpa_cli
 
@@ -591,7 +588,7 @@ OBJS += ../hostapd/wpa_auth_ie.o
 OBJS += ../hostapd/tkip_countermeasures.o
 OBJS += ../hostapd/mlme.o
 OBJS += ../hostapd/ieee802_1x.o
-OBJS += ../hostapd/eapol_sm.o
+OBJS += ../src/eapol_auth/eapol_auth_sm.o
 OBJS += ../hostapd/ieee802_11_auth.o
 OBJS += ../hostapd/drv_callbacks.o
 ifdef CONFIG_CTRL_IFACE
@@ -638,7 +635,7 @@ OBJS_h += ../src/radius/radius_client.o
 endif
 
 ifdef CONFIG_AUTHENTICATOR
-OBJS_h += ../hostapd/eapol_sm.o
+OBJS_h += ../eapol_auth/eapol_auth_sm.o
 OBJS_h += ../hostapd/ieee802_1x.o
 endif
 
@@ -1367,7 +1364,7 @@ TEST_EAP_SIM_COMMON_OBJS = $(SHA1OBJS) $(MD5OBJS) \
 	../src/utils/wpa_debug.o $(AESOBJS) \
 	tests/test_eap_sim_common.o
 test-eap_sim_common: $(TEST_EAP_SIM_COMMON_OBJS)
-	$(LDO) $(LDFLAGS) -o $@ $(TEST_AES_OBJS) $(LIBS)
+	$(LDO) $(LDFLAGS) -o $@ $(TEST_EAP_SIM_COMMON_OBJS) $(LIBS)
 	./test-eap_sim_common
 	rm test-eap_sim_common