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>

diff --git a/eap_example/Makefile b/eap_example/Makefile
index 7660b8ddd0361a61b89cabe59f23e0a5c281c44e..691466f03c9ad06c717c579c4c2526bd73757672 100644 (file)
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -90,15 +90,8 @@ OBJS_ex = eap_example.o eap_example_peer.o eap_example_server.o
 _OBJS_VAR := OBJS_ex
 include ../src/objs.mk
 
-
-../src/utils/libutils.a:
-       $(MAKE) -C ../src/utils
-
-../src/crypto/libcrypto.a:
-       $(MAKE) -C ../src/crypto
-
-../src/tls/libtls.a:
-       $(MAKE) -C ../src/tls
+_OBJS_VAR := EAP_LIBS
+include ../src/objs.mk
 
 
 ifneq ($(CONFIG_SOLIB), yes)

diff --git a/radius_example/Makefile b/radius_example/Makefile
index f0e4e535aa3ce7d9f0e38891569a24983b47c038..d58a82c340c6ac01a4762e43cb33fac26f343ff2 100644 (file)
--- a/radius_example/Makefile
+++ b/radius_example/Makefile
@@ -11,15 +11,6 @@ LIBS += ../src/crypto/libcrypto.a
 LIBS += ../src/utils/libutils.a
 LLIBS = -lrt
 
-../src/utils/libutils.a:
-       $(MAKE) -C ../src/utils
-
-../src/crypto/libcrypto.a:
-       $(MAKE) -C ../src/crypto
-
-../src/radius/libradius.a:
-       $(MAKE) -C ../src/radius
-
 #CLAGS += -DCONFIG_IPV6
 
 OBJS_ex = radius_example.o
@@ -27,6 +18,9 @@ OBJS_ex = radius_example.o
 _OBJS_VAR := OBJS_ex
 include ../src/objs.mk
 
+_OBJS_VAR := LIBS
+include ../src/objs.mk
+
 radius_example: $(OBJS_ex) $(LIBS)
        $(LDO) $(LDFLAGS) -o radius_example $(OBJS_ex) $(LIBS) $(LLIBS)
 

diff --git a/src/ap/Makefile b/src/ap/Makefile
index 425b123405a48f0bfcfe5381b317aa2398acae56..09d54924cb7e65c0a0c30c23ac213b5632f16cdf 100644 (file)
--- a/src/ap/Makefile
+++ b/src/ap/Makefile
@@ -1,4 +1,4 @@
-ALL=libap.a
+ALL=$(OUT)libap.a
 
 include ../lib.rules
 
@@ -67,5 +67,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libap.a: $(LIB_OBJS)
+$(OUT)libap.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/build.rules b/src/build.rules
index 5960ba8415b4a13bdea210073cd13443fca647a9..ec1cd66ce2a69b19c6759aff5602f4bee118ad94 100644 (file)
--- a/src/build.rules
+++ b/src/build.rules
@@ -9,9 +9,14 @@ ROOTDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ROOTDIR := $(dir $(ROOTDIR:%../src/=%))../
 BUILDDIR ?= $(abspath $(ROOTDIR)build)
 BUILDDIR := $(BUILDDIR:%/=%)
-_PROJ := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
 ABSROOT := $(abspath $(ROOTDIR))
+ifeq ($(origin OUT),command line)
+_PROJ := $(OUT:%/=%)
+_PROJ := $(_PROJ:$(BUILDDIR)/%=%)
+else
+_PROJ := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
 _PROJ := $(_PROJ:$(ABSROOT)/%=%)
+endif
 
 ifndef CC
 CC=gcc
@@ -88,9 +93,13 @@ $(BUILDDIR)/$(PROJ)/wpa_supplicant/%.o: $(ROOTDIR)wpa_supplicant/%.c $(CONFIG_FI
        $(Q)$(CC) -c -o $@ $(CFLAGS) $<
        @$(E) "  CC " $<
 
+# libraries - they know how to build themselves
+$(BUILDDIR)/$(PROJ)/%.a: $(CONFIG_FILE)
+       $(Q)mkdir -p $(BUILDDIR)/$(PROJ)/$(dir $(@:$(BUILDDIR)/$(PROJ)/%=%))
+       $(Q)$(MAKE) -C $(ROOTDIR)$(dir $(@:$(BUILDDIR)/$(PROJ)/%=%)) OUT=$(abspath $(dir $@))/
+
 BUILDOBJ = $(patsubst %,$(BUILDDIR)/$(PROJ)/%,$(patsubst $(ROOTDIR)%,%,$(1)))
 
 .PHONY: common-clean
 common-clean:
-       $(Q)$(MAKE) -C $(ROOTDIR)/src clean
        $(Q)rm -rf $(ALL) $(BUILDDIR)/$(PROJ)

diff --git a/src/common/Makefile b/src/common/Makefile
index 4cd48d9fd8ceb1f29fe9bb3ce58e11f83d870217..19573ebd30e0b6189f455a4d85895ff4146030a8 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,4 +1,4 @@
-ALL=libcommon.a
+ALL=$(OUT)libcommon.a
 
 include ../lib.rules
 
@@ -21,5 +21,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libcommon.a: $(LIB_OBJS)
+$(OUT)libcommon.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/crypto/Makefile b/src/crypto/Makefile
index 3af5406ea3811b54512eb52b17b13ec6e77eb485..b8accd81c58383b89d5a4290f6a75177106a253e 100644 (file)
--- a/src/crypto/Makefile
+++ b/src/crypto/Makefile
@@ -1,4 +1,4 @@
-ALL=libcrypto.a
+ALL=$(OUT)libcrypto.a
 
 include ../lib.rules
 
@@ -68,5 +68,5 @@ endif
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libcrypto.a: $(LIB_OBJS)
+$(OUT)libcrypto.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/eap_common/Makefile b/src/eap_common/Makefile
index 49fbbde026916893c85c8727cbbc11269ce9bf6f..b50a4b731412b36aef10b3fc1c05ff8354a0f291 100644 (file)
--- a/src/eap_common/Makefile
+++ b/src/eap_common/Makefile
@@ -1,4 +1,4 @@
-ALL=libeap_common.a
+ALL=$(OUT)libeap_common.a
 
 include ../lib.rules
 
@@ -25,5 +25,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libeap_common.a: $(LIB_OBJS)
+$(OUT)libeap_common.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 36439b7883797bd2b1f77edba0c14ab719c51749..d7a0372ad7610b0e99b572ca70076dfcf05a4cd5 100644 (file)
--- a/src/eap_peer/Makefile
+++ b/src/eap_peer/Makefile
@@ -1,4 +1,4 @@
-ALL=libeap_peer.a
+ALL=$(OUT)libeap_peer.a
 
 include ../lib.rules
 
@@ -17,5 +17,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libeap_peer.a: $(LIB_OBJS)
+$(OUT)libeap_peer.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/eap_server/Makefile b/src/eap_server/Makefile
index 946ac195e2513825664afb67deec3350c14747e0..b4261ec39263e17a6e8db79c26d78e226826c07a 100644 (file)
--- a/src/eap_server/Makefile
+++ b/src/eap_server/Makefile
@@ -1,4 +1,4 @@
-ALL=libeap_server.a
+ALL=$(OUT)libeap_server.a
 
 include ../lib.rules
 
@@ -15,5 +15,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libeap_server.a: $(LIB_OBJS)
+$(OUT)libeap_server.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/eapol_auth/Makefile b/src/eapol_auth/Makefile
index 777979ce7c4f646cdcee3a368bf8d31ce9a4cdd2..aa597eda4499a19f024703a2c28fe6f706f387a7 100644 (file)
--- a/src/eapol_auth/Makefile
+++ b/src/eapol_auth/Makefile
@@ -1,4 +1,4 @@
-ALL=libeapol_auth.a
+ALL=$(OUT)libeapol_auth.a
 
 include ../lib.rules
 
@@ -10,5 +10,5 @@ LIB_OBJS = eapol_auth_sm.o eapol_auth_dump.o
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libeapol_auth.a: $(LIB_OBJS)
+$(OUT)libeapol_auth.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/eapol_supp/Makefile b/src/eapol_supp/Makefile
index 265e5f25c37c1777cb0bfb3af6a9e6fc0f1919da..453e49e6bf4b7dc42f1fd7f78d37efdaec03be89 100644 (file)
--- a/src/eapol_supp/Makefile
+++ b/src/eapol_supp/Makefile
@@ -1,4 +1,4 @@
-ALL=libeapol_supp.a
+ALL=$(OUT)libeapol_supp.a
 
 include ../lib.rules
 
@@ -12,5 +12,5 @@ LIB_OBJS = eapol_supp_sm.o
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libeapol_supp.a: $(LIB_OBJS)
+$(OUT)libeapol_supp.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/l2_packet/Makefile b/src/l2_packet/Makefile
index ab8c86ecc43d022d50c89822c601c401c9b61e1e..870d652bc63e9fcb2914c887c361881f74742acb 100644 (file)
--- a/src/l2_packet/Makefile
+++ b/src/l2_packet/Makefile
@@ -1,4 +1,4 @@
-ALL=libl2_packet.a
+ALL=$(OUT)libl2_packet.a
 
 include ../lib.rules
 
@@ -10,5 +10,5 @@ LIB_OBJS = l2_packet_linux.o
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libl2_packet.a: $(LIB_OBJS)
+$(OUT)libl2_packet.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/objs.mk b/src/objs.mk
index df9fb17a1c10728f02ef7161a73c33e6a4ef095a..54e42e6999df7918a899bf0cd122994b00998b4d 100644 (file)
--- a/src/objs.mk
+++ b/src/objs.mk
@@ -1,3 +1,3 @@
 $(_OBJS_VAR) := $(call BUILDOBJ,$($(_OBJS_VAR)))
--include $($(_OBJS_VAR):%.o=%.d)
+-include $($($(_OBJS_VAR):%.o=%.d):%.a=%.d)
 _DIRS += $(dir $($(_OBJS_VAR)))

diff --git a/src/p2p/Makefile b/src/p2p/Makefile
index c6b406661182c7dea0d44596fc6efa96746c9faf..00e1908f0bc1a5cf3ef855271b66d8d292e9fa18 100644 (file)
--- a/src/p2p/Makefile
+++ b/src/p2p/Makefile
@@ -1,4 +1,4 @@
-ALL=libp2p.a
+ALL=$(OUT)libp2p.a
 
 include ../lib.rules
 
@@ -23,5 +23,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libp2p.a: $(LIB_OBJS)
+$(OUT)libp2p.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/radius/Makefile b/src/radius/Makefile
index 83096f0c7fbbc638696891c78a0c646707066fc9..5cefa390fab9623ffe9d3528f7e498cd68bcdf49 100644 (file)
--- a/src/radius/Makefile
+++ b/src/radius/Makefile
@@ -1,4 +1,4 @@
-ALL=libradius.a
+ALL=$(OUT)libradius.a
 
 include ../lib.rules
 
@@ -16,5 +16,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libradius.a: $(LIB_OBJS)
+$(OUT)libradius.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/rsn_supp/Makefile b/src/rsn_supp/Makefile
index 43288e3fd688fc9eb54e6fe799a81ef080244007..f5f5cad17dfb86f013fab4a1d9196acf9292fb7d 100644 (file)
--- a/src/rsn_supp/Makefile
+++ b/src/rsn_supp/Makefile
@@ -1,4 +1,4 @@
-ALL=librsn_supp.a
+ALL=$(OUT)librsn_supp.a
 
 include ../lib.rules
 
@@ -21,5 +21,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-librsn_supp.a: $(LIB_OBJS)
+$(OUT)librsn_supp.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/tls/Makefile b/src/tls/Makefile
index 3fac5ee8c6cd62b5e9ab0958cdc9aaf5a026a30b..5483345e53316ab14a415c63f8e38030d4b73d2d 100644 (file)
--- a/src/tls/Makefile
+++ b/src/tls/Makefile
@@ -1,4 +1,4 @@
-ALL=libtls.a
+ALL=$(OUT)libtls.a
 
 include ../lib.rules
 
@@ -33,5 +33,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libtls.a: $(LIB_OBJS)
+$(OUT)libtls.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/utils/Makefile b/src/utils/Makefile
index 7be05101fc30ced7f1a0897d859d80f2ab5d4d34..91aba38466ff183bceaeff57cef0e6ed3ae29b58 100644 (file)
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1,4 +1,4 @@
-ALL=libutils.a
+ALL=$(OUT)libutils.a
 
 include ../lib.rules
 
@@ -36,5 +36,5 @@ LIB_OBJS += edit.o
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libutils.a: $(LIB_OBJS)
+$(OUT)libutils.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/src/wps/Makefile b/src/wps/Makefile
index ed928ef41e94e1dedd0f69009e80ecc00518a886..79106952783d3a3a220d95352225c2bbc53a2215 100644 (file)
--- a/src/wps/Makefile
+++ b/src/wps/Makefile
@@ -1,4 +1,4 @@
-ALL=libwps.a
+ALL=$(OUT)libwps.a
 
 include ../lib.rules
 
@@ -35,5 +35,5 @@ LIB_OBJS= \
 
 _OBJS_VAR := LIB_OBJS
 include ../objs.mk
-libwps.a: $(LIB_OBJS)
+$(OUT)libwps.a: $(LIB_OBJS)
        $(AR) crT $@ $?

diff --git a/tests/Makefile b/tests/Makefile
index c8ba3f21c0b80cf3f342724143ac5256b2507155..72fb8ee4f5014313c1a0bfb5cc8f045c6072849d 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -42,55 +42,19 @@ DLIBS = ../src/crypto/libcrypto.a \
        ../src/rsn_supp/librsn_supp.a \
        ../src/tls/libtls.a
 
+_OBJS_VAR := LLIBS
+include ../src/objs.mk
+_OBJS_VAR := SLIBS
+include ../src/objs.mk
+_OBJS_VAR := DLIBS
+include ../src/objs.mk
+
 LIBS = $(SLIBS) $(DLIBS)
 LLIBS = -Wl,--start-group $(DLIBS) -Wl,--end-group $(SLIBS)
 
 # glibc < 2.17 needs -lrt for clock_gettime()
 LLIBS += -lrt
 
-../src/utils/libutils.a:
-       $(MAKE) -C ../src/utils
-
-../src/common/libcommon.a:
-       $(MAKE) -C ../src/common
-
-../src/crypto/libcrypto.a:
-       $(MAKE) -C ../src/crypto
-
-../src/tls/libtls.a:
-       $(MAKE) -C ../src/tls
-
-../src/ap/libap.a:
-       $(MAKE) -C ../src/ap
-
-../src/radius/libradius.a:
-       $(MAKE) -C ../src/radius
-
-../src/l2_packet/libl2_packet.a:
-       $(MAKE) -C ../src/l2_packet
-
-../src/wps/libwps.a:
-       $(MAKE) -C ../src/wps
-
-../src/eap_peer/libeap_peer.a:
-       $(MAKE) -C ../src/eap_peer
-
-../src/eap_server/libeap_server.a:
-       $(MAKE) -C ../src/eap_server
-
-../src/eap_common/libeap_common.a:
-       $(MAKE) -C ../src/eap_common
-
-../src/eapol_auth/libeapol_auth.a:
-       $(MAKE) -C ../src/eapol_auth
-
-../src/eapol_supp/libeapol_supp.a:
-       $(MAKE) -C ../src/eapol_supp
-
-../src/rsn_supp/librsn_supp.a:
-       $(MAKE) -C ../src/rsn_supp
-
-
 test-aes: $(call BUILDOBJ,test-aes.o) $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
 

diff --git a/tests/fuzzing/ap-mgmt/Makefile b/tests/fuzzing/ap-mgmt/Makefile
index 159c7c3f8106c7cbc9b34762765a9220d8e77f3f..74b6a02da3fd7a1bb5ada55f35003675367aa9a6 100644 (file)
--- a/tests/fuzzing/ap-mgmt/Makefile
+++ b/tests/fuzzing/ap-mgmt/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/asn1/Makefile b/tests/fuzzing/asn1/Makefile
index fb8fbed684ef2f2a8b235832495190254b1a0010..274641a406bb81f6731235eeb35725f626fade10 100644 (file)
--- a/tests/fuzzing/asn1/Makefile
+++ b/tests/fuzzing/asn1/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/dpp-uri/Makefile b/tests/fuzzing/dpp-uri/Makefile
index aca8f02ad4347e6eb19b02962d584ed137041b95..1c1bab631a04b8933d6d43abd52f05ea8186c6b6 100644 (file)
--- a/tests/fuzzing/dpp-uri/Makefile
+++ b/tests/fuzzing/dpp-uri/Makefile
@@ -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
 

diff --git a/tests/fuzzing/eap-aka-peer/Makefile b/tests/fuzzing/eap-aka-peer/Makefile
index bd960caa763eca5ad7143885337098919dc3fb31..c964f186d146fc0f91a15cbb0dc673a7e001fba8 100644 (file)
--- a/tests/fuzzing/eap-aka-peer/Makefile
+++ b/tests/fuzzing/eap-aka-peer/Makefile
@@ -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 " $@

diff --git a/tests/fuzzing/eap-mschapv2-peer/Makefile b/tests/fuzzing/eap-mschapv2-peer/Makefile
index 953855c85ed45bff61ba9dd07f9080c5318fa3a4..7290e90c62b7f45b9c51228868df8b8a334ab74d 100644 (file)
--- a/tests/fuzzing/eap-mschapv2-peer/Makefile
+++ b/tests/fuzzing/eap-mschapv2-peer/Makefile
@@ -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 " $@

diff --git a/tests/fuzzing/eap-sim-peer/Makefile b/tests/fuzzing/eap-sim-peer/Makefile
index 9292ccb79b2d96cac3b200caeeae789df9a7288d..9e728e4f476b923f6bf852923ac40334f756b699 100644 (file)
--- a/tests/fuzzing/eap-sim-peer/Makefile
+++ b/tests/fuzzing/eap-sim-peer/Makefile
@@ -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 " $@

diff --git a/tests/fuzzing/eapol-key-auth/Makefile b/tests/fuzzing/eapol-key-auth/Makefile
index bdc731ff493187decb1d664f3d8206080073bea9..bd15b91f2394c1325661a8bd2abc4fe610e3ce86 100644 (file)
--- a/tests/fuzzing/eapol-key-auth/Makefile
+++ b/tests/fuzzing/eapol-key-auth/Makefile
@@ -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
 

diff --git a/tests/fuzzing/eapol-key-supp/Makefile b/tests/fuzzing/eapol-key-supp/Makefile
index 29e419b7cd034293e35ac528d1d53ff1c4cae6e3..949e2efe991ced4734b2011ad0da575dcfe36290 100644 (file)
--- a/tests/fuzzing/eapol-key-supp/Makefile
+++ b/tests/fuzzing/eapol-key-supp/Makefile
@@ -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
 

diff --git a/tests/fuzzing/eapol-supp/Makefile b/tests/fuzzing/eapol-supp/Makefile
index 27e631148df14fa20d3caf6494a03f3c7c8f935b..ea32346b2df1666e2e261a4e1f18e3aba4054c9e 100644 (file)
--- a/tests/fuzzing/eapol-supp/Makefile
+++ b/tests/fuzzing/eapol-supp/Makefile
@@ -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
 

diff --git a/tests/fuzzing/json/Makefile b/tests/fuzzing/json/Makefile
index 8de19293e29bb975d4d20c2c8638fab01a598db9..9dd51a5f22ef9831232618f67e685851c9b8d2bd 100644 (file)
--- a/tests/fuzzing/json/Makefile
+++ b/tests/fuzzing/json/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/p2p/Makefile b/tests/fuzzing/p2p/Makefile
index ef31a7505e282beea475335eb3313c42367fa1c9..acac9d38f1b1fa810b3406a729227b72d5679357 100644 (file)
--- a/tests/fuzzing/p2p/Makefile
+++ b/tests/fuzzing/p2p/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/rules.include b/tests/fuzzing/rules.include
index b2e8a81ea878c7857c6ee29d8928418537f959f9..e2cf577af811091c24b759b26b53255b110ae6bb 100644 (file)
--- a/tests/fuzzing/rules.include
+++ b/tests/fuzzing/rules.include
@@ -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

diff --git a/tests/fuzzing/sae/Makefile b/tests/fuzzing/sae/Makefile
index ee7257afeaa8f174e7ef7c9f57885099b7c7e566..ee4b0c0b6a225e4c34ce23918aa2e064472dff9b 100644 (file)
--- a/tests/fuzzing/sae/Makefile
+++ b/tests/fuzzing/sae/Makefile
@@ -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
 

diff --git a/tests/fuzzing/tls-client/Makefile b/tests/fuzzing/tls-client/Makefile
index 7d5e8d536fe7d4e4308f6e95128f9068442d248a..84cfa0431566d066823b5fd25600320755307316 100644 (file)
--- a/tests/fuzzing/tls-client/Makefile
+++ b/tests/fuzzing/tls-client/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/tls-server/Makefile b/tests/fuzzing/tls-server/Makefile
index 45304328e4b2bfc4d6273956319fcb744bec779b..8e2400310397608d6825d086f1e3930bbd427e9b 100644 (file)
--- a/tests/fuzzing/tls-server/Makefile
+++ b/tests/fuzzing/tls-server/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/wnm/Makefile b/tests/fuzzing/wnm/Makefile
index f27dd341b3333d7ef4af9530f79caa429b3cd71d..73eab538765c4d443da319be6b55efd991e8eee7 100644 (file)
--- a/tests/fuzzing/wnm/Makefile
+++ b/tests/fuzzing/wnm/Makefile
@@ -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)
 

diff --git a/tests/fuzzing/x509/Makefile b/tests/fuzzing/x509/Makefile
index 7fff15a3a94a6fe0fc6967b6ae5b804631ade1b6..306473c3dba3eb12a47a1e414ffcc88c33858c06 100644 (file)
--- a/tests/fuzzing/x509/Makefile
+++ b/tests/fuzzing/x509/Makefile
@@ -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)
 

diff --git a/wlantest/Makefile b/wlantest/Makefile
index 410c309d474556be099c07ee90eb247f2ed48b44..602375112f2de124d896c347a973a5b51e59a097 100644 (file)
--- a/wlantest/Makefile
+++ b/wlantest/Makefile
@@ -62,13 +62,6 @@ TOBJS += bip.o
 TOBJS += gcmp.o
 
 
-../src/utils/libutils.a:
-       $(MAKE) -C ../src/utils
-
-../src/crypto/libcrypto.a:
-       $(MAKE) -C ../src/crypto
-
-
 OBJS_cli = wlantest_cli.o
 
 _OBJS_VAR := OBJS
@@ -77,6 +70,8 @@ _OBJS_VAR := TOBJS
 include ../src/objs.mk
 _OBJS_VAR := OBJS_cli
 include ../src/objs.mk
+_OBJS_VAR := OWN_LIBS
+include ../src/objs.mk
 
 wlantest: $(OBJS) $(OWN_LIBS)
        $(LDO) $(LDFLAGS) -o wlantest $(OBJS) $(OWN_LIBS) $(LIBS)