From: Jouni Malinen <jouni@codeaurora.org>
Date: Wed, 14 Oct 2020 19:57:04 +0000 (+0300)
Subject: build: Fix libeap_peer.a build
X-Git-Tag: hostap_2_10~819
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39748963d76152e05cf8177306af11f4ffe6f434;p=thirdparty%2Fhostap.git

build: Fix libeap_peer.a build

The install target at the beginning of src/eap_peer/Makefile was
confusing make about the build rules for libeap_peer.a and overriding of
the install target between src/eap_peer/Makefile and src/lib.rules was
breaking installation of dynamic EAP peer *.so files.

Fix this by lib.rules defining a default for the install target so that
src/*/Makefile can override that and by moving the install target for
eap_peer to the end of the Makefile.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---

diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 762c7a8eb..bdbead6a6 100644
--- a/src/eap_peer/Makefile
+++ b/src/eap_peer/Makefile
@@ -1,9 +1,3 @@
-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= \
@@ -11,3 +5,9 @@ LIB_OBJS= \
 	eap_methods.o
 
 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
diff --git a/src/lib.rules b/src/lib.rules
index 8182db8c7..59801c517 100644
--- a/src/lib.rules
+++ b/src/lib.rules
@@ -19,8 +19,11 @@ $(ALL): $(LIB_OBJS)
 	@$(E) "  AR  $(notdir $@)"
 	$(Q)$(AR) crT $@ $?
 
-install:
+install-default:
 	@echo Nothing to be made.
 
+%: %-default
+	@true
+
 clean:
 	$(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL)