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 762c7a8ebbce3c63a86395824a1bcf2b36412f05..bdbead6a6cb5ec41c5dc7e30633c0340f959cb1e 100644 (file)
--- 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 8182db8c7eb7f3dcab973d9c68dfcb529cf4b7ac..59801c5171cb99b1b23932f7b237e49af97a9dbb 100644 (file)
--- 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)