Remove src/crypto from default include path

[libeap.git] / wpa_supplicant / Makefile

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 173ff8a..8daae75 100644 (file)
--- 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
 
@@ -497,13 +494,23 @@ ifdef NEED_WPS_OOB
 CFLAGS += -DCONFIG_WPS_OOB
 endif
 
+ifdef CONFIG_WPS_ER
+CONFIG_WPS_UPNP=y
+CFLAGS += -DCONFIG_WPS_ER
+OBJS += ../src/wps/wps_er.o
+OBJS += ../src/wps/wps_er_ssdp.o
+endif
+
 ifdef CONFIG_WPS_UPNP
 CFLAGS += -DCONFIG_WPS_UPNP
 OBJS += ../src/wps/wps_upnp.o
 OBJS += ../src/wps/wps_upnp_ssdp.o
 OBJS += ../src/wps/wps_upnp_web.o
 OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/upnp_xml.o
 OBJS += ../src/wps/httpread.o
+OBJS += ../src/wps/http_client.o
+OBJS += ../src/wps/http_server.o
 endif
 
 endif
@@ -581,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
@@ -628,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
 
@@ -780,8 +787,14 @@ OBJS += ../src/tls/tlsv1_client_read.o
 OBJS += ../src/tls/asn1.o
 OBJS += ../src/tls/rsa.o
 OBJS += ../src/tls/x509v3.o
+OBJS += ../src/tls/pkcs1.o
+OBJS += ../src/tls/pkcs5.o
+OBJS += ../src/tls/pkcs8.o
 OBJS_p += ../src/tls/asn1.o
 OBJS_p += ../src/tls/rsa.o
+OBJS_p += ../src/tls/pkcs1.o
+OBJS_p += ../src/tls/pkcs5.o
+OBJS_p += ../src/tls/pkcs8.o
 OBJS_p += ../src/crypto/rc4.o
 NEED_BASE64=y
 NEED_TLS_PRF=y
@@ -807,6 +820,7 @@ ifeq ($(CONFIG_CRYPTO), internal)
 CFLAGS += -DCONFIG_INTERNAL_X509
 OBJS += ../src/crypto/crypto_internal.o
 OBJS_p += ../src/crypto/crypto_internal.o
+NEED_AES_ENC=y
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 ifdef CONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
@@ -1010,12 +1024,12 @@ OBJS += ctrl_iface.o ctrl_iface_$(CONFIG_CTRL_IFACE).o
 endif
 
 ifdef CONFIG_CTRL_IFACE_DBUS
-CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
-OBJS += ctrl_iface_dbus.o ctrl_iface_dbus_handlers.o dbus_dict_helpers.o
+DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
+DBUS_OBJS += ctrl_iface_dbus.o ctrl_iface_dbus_handlers.o
+DBUS_OBJS += dbus_dict_helpers.o
 ifndef DBUS_LIBS
 DBUS_LIBS := $(shell pkg-config --libs dbus-1)
 endif
-LIBS += $(DBUS_LIBS)
 ifndef DBUS_INCLUDE
 DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1)
 endif
@@ -1030,8 +1044,31 @@ DBUS_VERSION_MINOR=0
 endif
 DBUS_INCLUDE += -DDBUS_VERSION_MAJOR=$(DBUS_VERSION_MAJOR)
 DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR)
-CFLAGS += $(DBUS_INCLUDE)
+DBUS_CFLAGS += $(DBUS_INCLUDE)
+endif
+
+ifdef CONFIG_CTRL_IFACE_DBUS_NEW
+DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_NEW
+DBUS_OBJS ?= dbus_dict_helpers.o
+DBUS_OBJS += ctrl_iface_dbus_new_helpers.o
+DBUS_OBJS += ctrl_iface_dbus_new.o ctrl_iface_dbus_new_handlers.o
+ifndef DBUS_LIBS
+DBUS_LIBS := $(shell pkg-config --libs dbus-1)
+endif
+ifndef DBUS_INCLUDE
+DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1)
+endif
+ifdef CONFIG_CTRL_IFACE_DBUS_INTRO
+DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO
+DBUS_INCLUDE += $(shell xml2-config --cflags)
+DBUS_LIBS += $(shell xml2-config --libs)
 endif
+DBUS_CFLAGS += $(DBUS_INCLUDE)
+endif
+
+OBJS += $(DBUS_OBJS)
+CFLAGS += $(DBUS_CFLAGS)
+LIBS += $(DBUS_LIBS)
 
 ifdef CONFIG_READLINE
 CFLAGS += -DCONFIG_READLINE
@@ -1083,6 +1120,10 @@ ifndef CONFIG_MAIN
 CONFIG_MAIN=main
 endif
 
+ifdef CONFIG_DEBUG_SYSLOG
+CFLAGS += -DCONFIG_DEBUG_SYSLOG
+endif
+
 ifdef CONFIG_DEBUG_FILE
 CFLAGS += -DCONFIG_DEBUG_FILE
 endif
@@ -1323,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
 
@@ -1344,26 +1385,6 @@ tests: test-ms_funcs test-sha1 test-aes test-eap_sim_common test-md4 test-md5
 clean:
        $(MAKE) -C ../src clean
        rm -f core *~ *.o *.d eap_*.so $(ALL) $(WINALL) eapol_test preauth_test
-
-%.eps: %.fig
-       fig2dev -L eps $*.fig $*.eps
-
-%.png: %.fig
-       fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \
-               > $*.png
-
-docs-pics: doc/wpa_supplicant.png doc/wpa_supplicant.eps
-
-docs: docs-pics
-       (cd ..; doxygen wpa_supplicant/doc/doxygen.full; cd wpa_supplicant)
-       $(MAKE) -C doc/latex
-       cp doc/latex/refman.pdf wpa_supplicant-devel.pdf
-
-docs-fast: docs-pics
-       (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
+       rm -f wpa_priv
 
 -include $(OBJS:%.o=%.d)