build: Use build.rules in lib.rules

Use the new build.rules in lib.rules and also unify the
clean targets to lib.rules.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

src/ap/Makefile

@@ -1,12 +1,10 @@
-all: libap.a
+ALL=libap.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libap.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DHOSTAPD
 CFLAGS += -DNEED_AP_MLME

src/common/Makefile

@@ -1,12 +1,10 @@
-all: libcommon.a
+ALL=libcommon.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libcommon.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DCONFIG_IEEE80211R
 CFLAGS += -DCONFIG_HS20

src/crypto/Makefile

@@ -1,14 +1,11 @@
-all: libcrypto.a
+ALL=libcrypto.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libcrypto.a
 
 install:
 	@echo Nothing to be made.
 
 
-include ../lib.rules
-
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
 CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER

src/eap_common/Makefile

@@ -1,12 +1,10 @@
-all: libeap_common.a
+ALL=libeap_common.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeap_common.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 LIB_OBJS= \
 	chap.o \

src/eap_peer/Makefile

@@ -1,7 +1,6 @@
-all: libeap_peer.a
+ALL=libeap_peer.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap_peer.a
 
 install:
 	if ls *.so >/dev/null 2>&1; then \
@@ -9,7 +8,6 @@ install:
 		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
 	; fi
 
-include ../lib.rules
 
 CFLAGS += -DIEEE8021X_EAPOL
 

src/eap_server/Makefile

@@ -1,12 +1,10 @@
-all: libeap_server.a
+ALL=libeap_server.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeap_server.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DCONFIG_HS20
 

src/eapol_auth/Makefile

@@ -1,12 +1,10 @@
-all: libeapol_auth.a
+ALL=libeapol_auth.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeapol_auth.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 LIB_OBJS = eapol_auth_sm.o eapol_auth_dump.o
 

src/eapol_supp/Makefile

@@ -1,12 +1,10 @@
-all: libeapol_supp.a
+ALL=libeapol_supp.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeapol_supp.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DIEEE8021X_EAPOL
 

src/l2_packet/Makefile

@@ -1,12 +1,10 @@
-all: libl2_packet.a
+ALL=libl2_packet.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libl2_packet.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 LIB_OBJS = l2_packet_linux.o
 

src/lib.rules

@@ -1,10 +1,5 @@
-ifndef CC
+LIB_RULES := $(lastword $(MAKEFILE_LIST))
-CC=gcc
+include $(dir $(LIB_RULES))build.rules
-endif
-
-ifndef CFLAGS
-CFLAGS = -MMD -O2 -Wall -g
-endif
 
 ifdef TEST_FUZZ
 CFLAGS += -DCONFIG_NO_RANDOM_POOL
@@ -14,18 +9,5 @@ endif
 CFLAGS += $(FUZZ_CFLAGS)
 CFLAGS += -I.. -I../utils
 
-
+clean:
-Q=@
+	$(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL)
-E=echo
-ifeq ($(V), 1)
-Q=
-E=true
-endif
-ifeq ($(QUIET), 1)
-Q=@
-E=true
-endif
-
-%.o: %.c
-	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
-	@$(E) "  CC " $<

src/p2p/Makefile

@@ -1,12 +1,10 @@
-all: libp2p.a
+ALL=libp2p.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libp2p.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DCONFIG_WIFI_DISPLAY
 CFLAGS += -DCONFIG_WPS_NFC

src/radius/Makefile

@@ -1,14 +1,11 @@
-all: libradius.a
+ALL=libradius.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libradius.a
 
 install:
 	@echo Nothing to be made.
 
 
-include ../lib.rules
-
 CFLAGS += -DCONFIG_IPV6
 
 LIB_OBJS= \

src/rsn_supp/Makefile

@@ -1,12 +1,10 @@
-all: librsn_supp.a
+ALL=librsn_supp.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov librsn_supp.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DCONFIG_IEEE80211R
 CFLAGS += -DCONFIG_TDLS

src/tls/Makefile

@@ -1,14 +1,11 @@
-all: libtls.a
+ALL=libtls.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d libtls.a
 
 install:
 	@echo Nothing to be made.
 
 
-include ../lib.rules
-
 CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
 CFLAGS += -DCONFIG_TLSV11

src/utils/Makefile

@@ -1,14 +1,11 @@
-all: libutils.a
+ALL=libutils.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libutils.a
 
 install:
 	@echo Nothing to be made.
 
 
-include ../lib.rules
-
 #CFLAGS += -DWPA_TRACE
 CFLAGS += -DCONFIG_IPV6
 CFLAGS += -DCONFIG_DEBUG_FILE

src/wps/Makefile

@@ -1,12 +1,10 @@
-all: libwps.a
+ALL=libwps.a
 
-clean:
+include ../lib.rules
-	rm -f *~ *.o *.d *.gcno *.gcda *.gcov libwps.a
 
 install:
 	@echo Nothing to be made.
 
-include ../lib.rules
 
 CFLAGS += -DCONFIG_P2P
 CFLAGS += -DCONFIG_WPS_OOB