diff options
| author | jkim <jkim@FreeBSD.org> | 2015-09-08 20:41:47 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-09-08 20:41:47 +0000 |
| commit | 673603781f9293c676a469f8376a9120413d1926 (patch) | |
| tree | 003a8fee068bb65e109197cbc7080c0392f528ba /usr.sbin/wpa | |
| parent | 7f8c7d805b32475b4f4c00be4facc9ba65430a07 (diff) | |
| download | FreeBSD-src-673603781f9293c676a469f8376a9120413d1926.zip FreeBSD-src-673603781f9293c676a469f8376a9120413d1926.tar.gz | |
Sort and remove duplicate compiler flags.
MFC after: 3 days
Diffstat (limited to 'usr.sbin/wpa')
| -rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 12 | ||||
| -rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Makefile | 15 |
2 files changed, 12 insertions, 15 deletions
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 04fbc4d..743f917 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -35,15 +35,15 @@ FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk .endif CFLAGS+=-DCONFIG_DRIVER_BSD \ - -DHOSTAPD \ -DCONFIG_DRIVER_RADIUS_ACL \ - -DCONFIG_RSN_PREAUTH \ + -DCONFIG_HS20 \ + -DCONFIG_INTERWORKING \ -DCONFIG_PEERKEY \ + -DCONFIG_RSN_PREAUTH \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ - -DCONFIG_INTERWORKING \ - -DCONFIG_HS20 + -DHOSTAPD .if ${MK_INET6} != "no" CFLAGS+= -DCONFIG_IPV6 .endif @@ -65,8 +65,8 @@ CFLAGS+=-DDPKCS12_FUNCS \ -DEAP_SERVER_PEAP \ -DEAP_SERVER_TLS \ -DEAP_SERVER_TTLS \ - -DEAP_TLS_FUNCS \ - -DEAP_SERVER_WSC + -DEAP_SERVER_WSC \ + -DEAP_TLS_FUNCS SRCS+= eap_server_gtc.c \ eap_server_identity.c \ diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index ecbacb1..badae0d 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -38,18 +38,18 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \ -DCONFIG_DRIVER_BSD \ -DCONFIG_DRIVER_NDIS \ -DCONFIG_DRIVER_WIRED \ + -DCONFIG_GAS \ + -DCONFIG_HS20 \ + -DCONFIG_IEEE80211R \ + -DCONFIG_INTERWORKING \ -DCONFIG_PEERKEY \ + -DCONFIG_PRIVSEP \ -DCONFIG_SMARTCARD \ -DCONFIG_TERMINATE_ONLASTIF \ + -DCONFIG_TLS=openssl \ -DCONFIG_WPS \ -DCONFIG_WPS2 \ -DCONFIG_WPS_UPNP \ - -DCONFIG_TLS=openssl \ - -DCONFIG_IEEE80211R \ - -DCONFIG_INTERWORKING \ - -DCONFIG_PRIVSEP \ - -DCONFIG_HS20 \ - -DCONFIG_GAS \ -DPKCS12_FUNCS #CFLAGS+= -g LIBADD= pcap util @@ -70,9 +70,6 @@ CFLAGS+=-DEAP_GTC \ -DEAP_PSK \ -DEAP_TLS \ -DEAP_TTLS \ - -DEAP_GTC \ - -DEAP_OTP \ - -DEAP_LEAP \ -DIEEE8021X_EAPOL SRCS+= chap.c \ eap.c \ |
