build: Make more library things common

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>

diff --git a/src/ap/Makefile b/src/ap/Makefile
index 9d67fb58b4e15dcd450b33ad198f97129c851f09..a1e9b7c44d2fb1bd0bd9904cf4c7756eab308a4f 100644 (file)
--- a/src/ap/Makefile
+++ b/src/ap/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DHOSTAPD
 CFLAGS += -DNEED_AP_MLME
 CFLAGS += -DCONFIG_ETH_P_OUI
@@ -63,5 +57,4 @@ LIB_OBJS= \
        wps_hostapd.o \
        x_snoop.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/common/Makefile b/src/common/Makefile
index a731c9230c0a40caad65f098357e4ea90f05d8a5..59ba6c5e2d78e4f5e1080c00dffdfcfd6d7e0cf3 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_IEEE80211R
 CFLAGS += -DCONFIG_HS20
 CFLAGS += -DCONFIG_SAE
@@ -17,5 +11,4 @@ LIB_OBJS= \
        sae.o \
        wpa_common.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/crypto/Makefile b/src/crypto/Makefile
index b0e13bd1d279c8754919f10bd849b97eb68a9661..ce0997091de140d45a9c12b39671eb66cba0c0ae 100644 (file)
--- a/src/crypto/Makefile
+++ b/src/crypto/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
 CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
@@ -63,6 +57,4 @@ ifndef TEST_FUZZ
 LIB_OBJS += random.o
 endif
 
-
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/eap_common/Makefile b/src/eap_common/Makefile
index c85d01de727b1b9784236a6a4844f688ab2e71ae..fd058a09a64d201f68b2e6e6c4431aa738512a38 100644 (file)
--- a/src/eap_common/Makefile
+++ b/src/eap_common/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 LIB_OBJS= \
        chap.o \
        eap_common.o \
@@ -21,5 +15,4 @@ LIB_OBJS= \
        eap_wsc_common.o \
        ikev2_common.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 1ce905d8c83938569295c0fbbf193dc614a026a5..762c7a8ebbce3c63a86395824a1bcf2b36412f05 100644 (file)
--- a/src/eap_peer/Makefile
+++ b/src/eap_peer/Makefile
@@ -1,17 +1,13 @@
-include ../lib.rules
-
 install:
        if ls *.so >/dev/null 2>&1; then \
                install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
                cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
        ; fi
 
-
 CFLAGS += -DIEEE8021X_EAPOL
 
 LIB_OBJS= \
        eap.o \
        eap_methods.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/eap_server/Makefile b/src/eap_server/Makefile
index c68565c07f9e9150e144ee646a3bb5ad081ff372..cc9b76d619a1546c34965a4d61f0ed3e5f54e8a2 100644 (file)
--- a/src/eap_server/Makefile
+++ b/src/eap_server/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_HS20
 
 LIB_OBJS= \
@@ -11,5 +5,4 @@ LIB_OBJS= \
        eap_server_identity.o \
        eap_server_methods.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/eapol_auth/Makefile b/src/eapol_auth/Makefile
index 328e18f508e2caacdba047e89e7893f4a353a204..c82042f437b2960a5dddbf9a4d78dcaa6fb2dac0 100644 (file)
--- a/src/eapol_auth/Makefile
+++ b/src/eapol_auth/Makefile
@@ -1,10 +1,2 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 LIB_OBJS = eapol_auth_sm.o eapol_auth_dump.o
-
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/eapol_supp/Makefile b/src/eapol_supp/Makefile
index 108e66c4c7aaa5db2fc6dd4fb8af84725270a581..67a11857bd43cf949d9e107485d235bcbda74997 100644 (file)
--- a/src/eapol_supp/Makefile
+++ b/src/eapol_supp/Makefile
@@ -1,12 +1,5 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DIEEE8021X_EAPOL
 
 LIB_OBJS = eapol_supp_sm.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/l2_packet/Makefile b/src/l2_packet/Makefile
index 5c69413f31681e2852400edc67ea5666a9c94a20..c616626bd3c70a8cacb53b21701a71a3996f76d9 100644 (file)
--- a/src/l2_packet/Makefile
+++ b/src/l2_packet/Makefile
@@ -1,10 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 LIB_OBJS = l2_packet_linux.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/lib.rules b/src/lib.rules
index 99b7bd02695885565c337fd9183e47a66b967b2f..8182db8c7eb7f3dcab973d9c68dfcb529cf4b7ac 100644 (file)
--- a/src/lib.rules
+++ b/src/lib.rules
@@ -12,10 +12,15 @@ endif
 CFLAGS += $(FUZZ_CFLAGS)
 CFLAGS += -I.. -I../utils
 
-.SECONDEXPANSION:
-$(ALL): $$(LIB_OBJS)
+_OBJS_VAR := LIB_OBJS
+include ../objs.mk
+
+$(ALL): $(LIB_OBJS)
        @$(E) "  AR  $(notdir $@)"
        $(Q)$(AR) crT $@ $?
 
+install:
+       @echo Nothing to be made.
+
 clean:
        $(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL)

diff --git a/src/p2p/Makefile b/src/p2p/Makefile
index 0289dec5e3b9c9404dc1c48866ddb5b25e475fba..4d1618006c68260545d2f0ec47e76c6ebc476090 100644 (file)
--- a/src/p2p/Makefile
+++ b/src/p2p/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_WIFI_DISPLAY
 CFLAGS += -DCONFIG_WPS_NFC
 
@@ -19,5 +13,4 @@ LIB_OBJS= \
        p2p_sd.o \
        p2p_utils.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/radius/Makefile b/src/radius/Makefile
index 8d25400e9c595ed2be491b33089a4cbc6ac5c7dc..8cfb33d35f9ff6fced5a3218d8c9d53118ddeb12 100644 (file)
--- a/src/radius/Makefile
+++ b/src/radius/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_IPV6
 
 LIB_OBJS= \
@@ -12,5 +6,4 @@ LIB_OBJS= \
        radius_das.o \
        radius_server.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/rsn_supp/Makefile b/src/rsn_supp/Makefile
index 25accf79576756976e0f0b946f3723ddfb39340e..d14d736c1db685867de177816f9d7d370de6850c 100644 (file)
--- a/src/rsn_supp/Makefile
+++ b/src/rsn_supp/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_IEEE80211R
 CFLAGS += -DCONFIG_TDLS
 CFLAGS += -DCONFIG_WNM
@@ -17,5 +11,4 @@ LIB_OBJS= \
        wpa.o \
        wpa_ie.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/tls/Makefile b/src/tls/Makefile
index 0e79902ef36410095a900b8841ad2f228be72d17..c84fbe85938cdf52ce7b983e58377484d8defd29 100644 (file)
--- a/src/tls/Makefile
+++ b/src/tls/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_TLSV11
@@ -28,6 +22,4 @@ LIB_OBJS= \
        tlsv1_server_write.o \
        x509v3.o
 
-
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/utils/Makefile b/src/utils/Makefile
index fc7f4323d219f27afde4d3cab6801f33db1ac0e5..e8ad997eed76ddc049c8e04faed29f9d5e25ad6f 100644 (file)
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 #CFLAGS += -DWPA_TRACE
 CFLAGS += -DCONFIG_IPV6
 CFLAGS += -DCONFIG_DEBUG_FILE
@@ -32,5 +26,4 @@ LIB_OBJS += edit.o
 
 #LIB_OBJS += pcsc_funcs.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules

diff --git a/src/wps/Makefile b/src/wps/Makefile
index d7660fdd4f4b128d429700cfa808d02bd3c12f07..cddc6865a559b2e2f3cb44cf6717fe37812316d9 100644 (file)
--- a/src/wps/Makefile
+++ b/src/wps/Makefile
@@ -1,9 +1,3 @@
-include ../lib.rules
-
-install:
-       @echo Nothing to be made.
-
-
 CFLAGS += -DCONFIG_P2P
 CFLAGS += -DCONFIG_WPS_OOB
 CFLAGS += -DCONFIG_WPS_NFC
@@ -31,5 +25,4 @@ LIB_OBJS= \
        wps_upnp_ssdp.o \
        wps_upnp_web.o
 
-_OBJS_VAR := LIB_OBJS
-include ../objs.mk
+include ../lib.rules