DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

build: Make more library things common

Browse source 
We don't really need to duplicate more of this, so just
move the lib.rules include to the end and do more of the
stuff that's common anyway there.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2020-10-12 12:14:05 +02:00 committed by Jouni Malinen
parent f4b3d14e97
commit 1d0d8888af
16 changed files with 22 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ap/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DHOSTAPD CFLAGS += -DHOSTAPD
CFLAGS += -DNEED_AP_MLME CFLAGS += -DNEED_AP_MLME
CFLAGS += -DCONFIG_ETH_P_OUI CFLAGS += -DCONFIG_ETH_P_OUI
@ -63,5 +57,4 @@ LIB_OBJS= \
wps_hostapd.o \ wps_hostapd.o \
x_snoop.o x_snoop.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/common/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R
CFLAGS += -DCONFIG_HS20 CFLAGS += -DCONFIG_HS20
CFLAGS += -DCONFIG_SAE CFLAGS += -DCONFIG_SAE
@ -17,5 +11,4 @@ LIB_OBJS= \
sae.o \ sae.o \
wpa_common.o wpa_common.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

10
src/crypto/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_CRYPTO_INTERNAL CFLAGS += -DCONFIG_CRYPTO_INTERNAL
CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
@ -63,6 +57,4 @@ ifndef TEST_FUZZ
LIB_OBJS += random.o LIB_OBJS += random.o
endif endif
include ../lib.rules
_OBJS_VAR := LIB_OBJS
include ../objs.mk

9
src/eap_common/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
LIB_OBJS= \ LIB_OBJS= \
chap.o \ chap.o \
eap_common.o \ eap_common.o \
@ -21,5 +15,4 @@ LIB_OBJS= \
eap_wsc_common.o \ eap_wsc_common.o \
ikev2_common.o ikev2_common.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

6
src/eap_peer/Makefile
View file

@ -1,17 +1,13 @@
include ../lib.rules
install: install:
if ls *.so >/dev/null 2>&1; then \ if ls *.so >/dev/null 2>&1; then \
install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \ install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \ cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
; fi ; fi
CFLAGS += -DIEEE8021X_EAPOL CFLAGS += -DIEEE8021X_EAPOL
LIB_OBJS= \ LIB_OBJS= \
eap.o \ eap.o \
eap_methods.o eap_methods.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/eap_server/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_HS20 CFLAGS += -DCONFIG_HS20
LIB_OBJS= \ LIB_OBJS= \
@ -11,5 +5,4 @@ LIB_OBJS= \
eap_server_identity.o \ eap_server_identity.o \
eap_server_methods.o eap_server_methods.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

10
src/eapol_auth/Makefile
View file

@ -1,10 +1,2 @@
include ../lib.rules
install:
@echo Nothing to be made.
LIB_OBJS = eapol_auth_sm.o eapol_auth_dump.o LIB_OBJS = eapol_auth_sm.o eapol_auth_dump.o
include ../lib.rules
_OBJS_VAR := LIB_OBJS
include ../objs.mk

9
src/eapol_supp/Makefile
View file

@ -1,12 +1,5 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DIEEE8021X_EAPOL CFLAGS += -DIEEE8021X_EAPOL
LIB_OBJS = eapol_supp_sm.o LIB_OBJS = eapol_supp_sm.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/l2_packet/Makefile
View file

@ -1,10 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
LIB_OBJS = l2_packet_linux.o LIB_OBJS = l2_packet_linux.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/lib.rules
View file

@ -12,10 +12,15 @@ endif
CFLAGS += $(FUZZ_CFLAGS) CFLAGS += $(FUZZ_CFLAGS)
CFLAGS += -I.. -I../utils CFLAGS += -I.. -I../utils
.SECONDEXPANSION: _OBJS_VAR := LIB_OBJS
$(ALL): $$(LIB_OBJS) include ../objs.mk
$(ALL): $(LIB_OBJS)
@$(E) " AR $(notdir $@)" @$(E) " AR $(notdir $@)"
$(Q)$(AR) crT $@ $? $(Q)$(AR) crT $@ $?
install:
@echo Nothing to be made.
clean: clean:
$(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL) $(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL)

9
src/p2p/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_WIFI_DISPLAY CFLAGS += -DCONFIG_WIFI_DISPLAY
CFLAGS += -DCONFIG_WPS_NFC CFLAGS += -DCONFIG_WPS_NFC
@ -19,5 +13,4 @@ LIB_OBJS= \
p2p_sd.o \ p2p_sd.o \
p2p_utils.o p2p_utils.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/radius/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_IPV6 CFLAGS += -DCONFIG_IPV6
LIB_OBJS= \ LIB_OBJS= \
@ -12,5 +6,4 @@ LIB_OBJS= \
radius_das.o \ radius_das.o \
radius_server.o radius_server.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/rsn_supp/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R
CFLAGS += -DCONFIG_TDLS CFLAGS += -DCONFIG_TDLS
CFLAGS += -DCONFIG_WNM CFLAGS += -DCONFIG_WNM
@ -17,5 +11,4 @@ LIB_OBJS= \
wpa.o \ wpa.o \
wpa_ie.o wpa_ie.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

10
src/tls/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
CFLAGS += -DCONFIG_CRYPTO_INTERNAL CFLAGS += -DCONFIG_CRYPTO_INTERNAL
CFLAGS += -DCONFIG_TLSV11 CFLAGS += -DCONFIG_TLSV11
@ -28,6 +22,4 @@ LIB_OBJS= \
tlsv1_server_write.o \ tlsv1_server_write.o \
x509v3.o x509v3.o
include ../lib.rules
_OBJS_VAR := LIB_OBJS
include ../objs.mk

9
src/utils/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
#CFLAGS += -DWPA_TRACE #CFLAGS += -DWPA_TRACE
CFLAGS += -DCONFIG_IPV6 CFLAGS += -DCONFIG_IPV6
CFLAGS += -DCONFIG_DEBUG_FILE CFLAGS += -DCONFIG_DEBUG_FILE
@ -32,5 +26,4 @@ LIB_OBJS += edit.o
#LIB_OBJS += pcsc_funcs.o #LIB_OBJS += pcsc_funcs.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk

9
src/wps/Makefile
View file

@ -1,9 +1,3 @@
include ../lib.rules
install:
@echo Nothing to be made.
CFLAGS += -DCONFIG_P2P CFLAGS += -DCONFIG_P2P
CFLAGS += -DCONFIG_WPS_OOB CFLAGS += -DCONFIG_WPS_OOB
CFLAGS += -DCONFIG_WPS_NFC CFLAGS += -DCONFIG_WPS_NFC
@ -31,5 +25,4 @@ LIB_OBJS= \
wps_upnp_ssdp.o \ wps_upnp_ssdp.o \
wps_upnp_web.o wps_upnp_web.o
_OBJS_VAR := LIB_OBJS include ../lib.rules
include ../objs.mk