Remove src/rsn_supp from default header path

This commit is contained in:
Jouni Malinen 2009-11-29 18:28:08 +02:00
parent 0c3abf8d22
commit 3acb50056c
20 changed files with 33 additions and 36 deletions

View file

@ -12,7 +12,6 @@ export BINDIR ?= /usr/local/sbin/
CFLAGS += -I../src CFLAGS += -I../src
CFLAGS += -I../src/crypto CFLAGS += -I../src/crypto
CFLAGS += -I../src/utils CFLAGS += -I../src/utils
CFLAGS += -I../src/rsn_supp
ALL=wpa_supplicant wpa_passphrase wpa_cli ALL=wpa_supplicant wpa_passphrase wpa_cli

View file

@ -15,7 +15,7 @@
#include "includes.h" #include "includes.h"
#include "common.h" #include "common.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "sha1.h" #include "sha1.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "config.h" #include "config.h"

View file

@ -16,15 +16,15 @@
#include "common.h" #include "common.h"
#include "eloop.h" #include "eloop.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "config.h" #include "config.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"
#include "ctrl_iface.h" #include "ctrl_iface.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "preauth.h" #include "rsn_supp/preauth.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"

View file

@ -27,7 +27,7 @@
#include "wpas_glue.h" #include "wpas_glue.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "wps_supplicant.h" #include "wps_supplicant.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
extern int wpa_debug_level; extern int wpa_debug_level;
extern int wpa_debug_show_keys; extern int wpa_debug_show_keys;

View file

@ -23,7 +23,7 @@
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "eloop.h" #include "eloop.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "eap_peer/eap_i.h" #include "eap_peer/eap_i.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "radius/radius.h" #include "radius/radius.h"

View file

@ -16,15 +16,15 @@
#include "common.h" #include "common.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "eloop.h" #include "eloop.h"
#include "config.h" #include "config.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"
#include "pcsc_funcs.h" #include "pcsc_funcs.h"
#include "preauth.h" #include "rsn_supp/preauth.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "notify.h" #include "notify.h"

View file

@ -17,8 +17,8 @@
#include "common.h" #include "common.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "wpa_ie.h" #include "rsn_supp/wpa_ie.h"
#include "../hostapd/wpa.h" #include "../hostapd/wpa.h"
#include "ibss_rsn.h" #include "ibss_rsn.h"

View file

@ -22,7 +22,7 @@
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "notify.h" #include "notify.h"
#include "driver_i.h" #include "driver_i.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "mlme.h" #include "mlme.h"

View file

@ -49,7 +49,7 @@ CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE
CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE
CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS
CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto
CFLAGS = $(CFLAGS) /I..\src\rsn_supp /I..\src\eapol_supp /I. CFLAGS = $(CFLAGS) /I.
CFLAGS = $(CFLAGS) /DWIN32 CFLAGS = $(CFLAGS) /DWIN32
CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c
CFLAGS = $(CFLAGS) /W3 CFLAGS = $(CFLAGS) /W3

View file

@ -22,14 +22,14 @@
#include "config.h" #include "config.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "eloop.h" #include "eloop.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "ctrl_iface.h" #include "ctrl_iface.h"
#include "pcsc_funcs.h" #include "pcsc_funcs.h"
#include "preauth.h" #include "rsn_supp/preauth.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "drivers/driver.h" #include "drivers/driver.h"

View file

@ -18,8 +18,8 @@
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "config.h" #include "config.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"

View file

@ -5,7 +5,7 @@ TARGETTYPE exe
SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc
USERINCLUDE .. ..\..\src ..\..\src\utils ..\..\src\crypto ..\..\src\rsn_supp USERINCLUDE .. ..\..\src ..\..\src\utils ..\..\src\crypto
SOURCEPATH .. SOURCEPATH ..
SOURCE main_symbian.cpp SOURCE main_symbian.cpp

View file

@ -18,8 +18,8 @@
#include "eloop.h" #include "eloop.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "../config.h" #include "../config.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "wpa_ie.h" #include "rsn_supp/wpa_ie.h"
#include "../hostapd/wpa.h" #include "../hostapd/wpa.h"

View file

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -119,7 +119,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View file

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -119,7 +119,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View file

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -119,7 +119,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include" AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View file

@ -22,7 +22,7 @@
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "eap_peer/eap.h" #include "eap_peer/eap.h"
#include "eap_server/eap_methods.h" #include "eap_server/eap_methods.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "eloop.h" #include "eloop.h"
#include "config.h" #include "config.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
@ -31,8 +31,8 @@
#include "ctrl_iface.h" #include "ctrl_iface.h"
#include "pcsc_funcs.h" #include "pcsc_funcs.h"
#include "common/version.h" #include "common/version.h"
#include "preauth.h" #include "rsn_supp/preauth.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "mlme.h" #include "mlme.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"

View file

@ -16,14 +16,14 @@
#include "common.h" #include "common.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "eloop.h" #include "eloop.h"
#include "config.h" #include "config.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"
#include "pmksa_cache.h" #include "rsn_supp/pmksa_cache.h"
#include "mlme.h" #include "mlme.h"
#include "sme.h" #include "sme.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"

View file

@ -28,7 +28,7 @@
#include "notify.h" #include "notify.h"
#include "eap_common/eap_wsc_common.h" #include "eap_common/eap_wsc_common.h"
#include "blacklist.h" #include "blacklist.h"
#include "wpa.h" #include "rsn_supp/wpa.h"
#include "wps_supplicant.h" #include "wps_supplicant.h"
#include "dh_group5.h" #include "dh_group5.h"

View file

@ -455,7 +455,6 @@
../../src, ../../src,
../../src/crypto, ../../src/crypto,
../../src/utils, ../../src/utils,
../../src/rsn_supp,
); );
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS"; OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
@ -478,7 +477,6 @@
../../src, ../../src,
../../src/crypto, ../../src/crypto,
../../src/utils, ../../src/utils,
../../src/rsn_supp,
); );
OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS"; OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
PREBINDING = NO; PREBINDING = NO;