d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usr.sbin/wpa: complete the revert of wpa import

Browse Source 
This completes the revert of b51f459a20.
This commit is contained in:
Cy Schubert 2021-04-17 10:48:35 -07:00
parent 0aad5de37c
commit 8c6732ac77
7 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/wpa/Makefile.inc
View File

@ -18,6 +18,7 @@ HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
${WPA_DISTDIR}/src/radius \
${WPA_DISTDIR}/src/rsn_supp \
${WPA_DISTDIR}/src/tls \
${WPA_DISTDIR}/src/utils \
${WPA_DISTDIR}/src/wps
CFLAGS+=-I${.CURDIR}

2
usr.sbin/wpa/hostapd/Makefile
View File

@ -8,7 +8,6 @@
${WPA_DISTDIR}/src/eap_server \
${WPA_DISTDIR}/src/eap_peer \
${WPA_DISTDIR}/src/drivers \
${WPA_DISTDIR}/src/utils \
${WPA_DISTDIR}/wpa_supplicant
PACKAGE= hostapd
@ -25,7 +24,6 @@ SRCS= accounting.c \
chap.c \
common.c \
config_file.c \
crc32.c \
ctrl_iface.c \
ctrl_iface_ap.c \
ctrl_iface_common.c \

3
usr.sbin/wpa/hostapd_cli/Makefile
View File

@ -2,8 +2,7 @@
.include "../Makefile.inc"
.PATH.c:${HOSTAPD_DISTDIR} \
${WPA_DISTDIR}/src/utils
.PATH.c:${HOSTAPD_DISTDIR}
PACKAGE= hostapd
PROG= hostapd_cli

9
usr.sbin/wpa/wpa_cli/Makefile
View File

@ -7,12 +7,11 @@
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/wpa_supplicant \
${WPA_DISTDIR}/src/eap_peer \
${WPA_DISTDIR}/src/utils \
${WPA_DISTDIR}/src/drivers
PACKAGE= wpa
PROG= wpa_cli
SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c config.c \
SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c config.c \
config_file.c \
ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
drivers.c driver_common.c \
@ -20,7 +19,7 @@ SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c config.c \
edit.c eloop.c events.c hw_features_common.c \
ieee802_11_common.c l2_packet_freebsd.c notify.c \
op_classes.c \
os_unix.c robust_av.c rrm.c scan.c wmm_ac.c \
os_unix.c rrm.c scan.c wmm_ac.c \
wpa.c wpa_cli.c \
wpa_ctrl.c wpa_common.c \
wpa_debug.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c
@ -38,10 +37,6 @@ LIBADD+= pcap util
TLS_FUNCS=y
OBJS+= utils_config.o
utils_config.o: ${WPA_DISTDIR}/src/utils/config.c
${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c
.include "../Makefile.crypto"
.include <bsd.prog.mk>

3
usr.sbin/wpa/wpa_passphrase/Makefile
View File

@ -2,8 +2,7 @@
.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/utils
.PATH.c:${WPA_SUPPLICANT_DISTDIR}
PACKAGE= wpa
PROG= wpa_passphrase

1
usr.sbin/wpa/wpa_priv/Makefile
View File

@ -3,7 +3,6 @@
.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/utils \
${WPA_DISTDIR}/src/drivers
PACKAGE= wpa

13
usr.sbin/wpa/wpa_supplicant/Makefile
View File

@ -6,13 +6,12 @@
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/eap_peer \
${WPA_DISTDIR}/src/utils \
${WPA_DISTDIR}/src/drivers
PACKAGE= wpa
PROG= wpa_supplicant
SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c \
SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c \
config.c config_file.c \
ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
driver_bsd.c driver_common.c \
@ -22,10 +21,8 @@ SRCS= base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c \
http_client.c http_server.c \
httpread.c hw_features_common.c \
ieee802_11_common.c l2_packet_freebsd.c main.c \
notify.c offchannel.c op_classes.c os_unix.c \
pmksa_cache.c preauth.c \
robust_av.c \
rrm.c scan.c twt.c upnp_xml.c \
notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \
rrm.c scan.c upnp_xml.c \
wmm_ac.c wpa.c wpa_common.c wpa_ctrl.c \
wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c
@ -160,10 +157,6 @@ SRCS+= eap_sake.c \
eap_sake_common.c
.endif
OBJS+= utils_config.o
utils_config.o: ${WPA_DISTDIR}/src/utils/config.c
${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c
.include "../Makefile.crypto"
.include <bsd.prog.mk>