build: Put archive files into build/ folder too
This is something I hadn't previously done, but there are cases where it's needed, e.g., building 'wlantest' and then one of the tests/fuzzing/*/ projects, they use a different configuration (fuzzing vs. not fuzzing). Perhaps more importantly, this gets rid of the last thing that was dumped into the source directories, apart from the binaries themselves. Note that due to the use of thin archives, this required building with absolute paths. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
00b5e99b65
commit
87098d3324
38 changed files with 121 additions and 145 deletions
|
@ -31,6 +31,12 @@ OBJS += ap-mgmt.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := ELIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
ap-mgmt: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -12,6 +12,9 @@ OBJS += asn1.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
asn1: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -33,6 +33,9 @@ OBJS += dpp-uri.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
dpp-uri: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
|
||||
|
||||
|
|
|
@ -15,6 +15,9 @@ OBJS += eap-aka-peer.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eap-aka-peer: $(OBJS) $(LIBS)
|
||||
$(Q)$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
@$(E) " LD " $@
|
||||
|
|
|
@ -14,6 +14,9 @@ OBJS += eap-mschapv2-peer.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eap-mschapv2-peer: $(OBJS) $(LIBS)
|
||||
$(Q)$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
@$(E) " LD " $@
|
||||
|
|
|
@ -15,6 +15,9 @@ OBJS += eap-sim-peer.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eap-sim-peer: $(OBJS) $(LIBS)
|
||||
$(Q)$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
@$(E) " LD " $@
|
||||
|
|
|
@ -24,6 +24,9 @@ OBJS += eapol-key-auth.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eapol-key-auth: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ -Wl,--start-group $(LIBS) -Wl,--end-group
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ OBJS += eapol-key-supp.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eapol-key-supp: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ -Wl,--start-group $(LIBS) -Wl,--end-group
|
||||
|
||||
|
|
|
@ -18,6 +18,9 @@ OBJS += eapol-supp.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
eapol-supp: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ -Wl,--start-group $(LIBS) -Wl,--end-group
|
||||
|
||||
|
|
|
@ -13,6 +13,9 @@ OBJS += json.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
json: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -13,6 +13,9 @@ OBJS += p2p.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
p2p: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
|
|
|
@ -27,47 +27,5 @@ SRC=../../../src
|
|||
CFLAGS += -I$(SRC) -I$(SRC)/utils -I$(WPAS_SRC)
|
||||
OBJS += ../fuzzer-common.o
|
||||
|
||||
$(SRC)/ap/libap.a:
|
||||
$(MAKE) -C $(SRC)/ap TEST_FUZZ=y
|
||||
|
||||
$(SRC)/common/libcommon.a:
|
||||
$(MAKE) -C $(SRC)/common
|
||||
|
||||
$(SRC)/crypto/libcrypto.a:
|
||||
$(MAKE) -C $(SRC)/crypto TEST_FUZZ=y
|
||||
|
||||
$(SRC)/eapol_auth/libeapol_auth.a:
|
||||
$(MAKE) -C $(SRC)/eapol_auth
|
||||
|
||||
$(SRC)/eapol_supp/libeapol_supp.a:
|
||||
$(MAKE) -C $(SRC)/eapol_supp
|
||||
|
||||
$(SRC)/eap_common/libeap_common.a:
|
||||
$(MAKE) -C $(SRC)/eap_common
|
||||
|
||||
$(SRC)/eap_peer/libeap_peer.a:
|
||||
$(MAKE) -C $(SRC)/eap_peer
|
||||
|
||||
$(SRC)/eap_server/libeap_server.a:
|
||||
$(MAKE) -C $(SRC)/eap_server
|
||||
|
||||
$(SRC)/l2_packet/libl2_packet.a:
|
||||
$(MAKE) -C $(SRC)/l2_packet
|
||||
|
||||
$(SRC)/p2p/libp2p.a:
|
||||
$(MAKE) -C $(SRC)/p2p
|
||||
|
||||
$(SRC)/radius/libradius.a:
|
||||
$(MAKE) -C $(SRC)/radius
|
||||
|
||||
$(SRC)/rsn_supp/librsn_supp.a:
|
||||
$(MAKE) -C $(SRC)/rsn_supp TEST_FUZZ=y
|
||||
|
||||
$(SRC)/tls/libtls.a:
|
||||
$(MAKE) -C $(SRC)/tls TEST_FUZZ=y
|
||||
|
||||
$(SRC)/utils/libutils.a:
|
||||
$(MAKE) -C $(SRC)/utils TEST_FUZZ=y
|
||||
|
||||
$(SRC)/wps/libwps.a:
|
||||
$(MAKE) -C $(SRC)/wps
|
||||
# for the lib builds
|
||||
export TEST_FUZZ=y
|
||||
|
|
|
@ -18,6 +18,9 @@ OBJS += sae.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
sae: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
|
||||
|
||||
|
|
|
@ -19,6 +19,12 @@ OBJS += tls-client.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := ELIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
tls-client: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -19,6 +19,12 @@ OBJS += tls-server.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := ELIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
tls-server: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -47,6 +47,12 @@ OBJS += wnm.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := ELIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
wnm: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
|
@ -14,6 +14,12 @@ OBJS += x509.o
|
|||
_OBJS_VAR := OBJS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := LIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
_OBJS_VAR := ELIBS
|
||||
include ../../../src/objs.mk
|
||||
|
||||
x509: $(OBJS) $(LIBS)
|
||||
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue