jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build: Fix libeap_peer.a build

Browse source 
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>
This commit is contained in:
Jouni Malinen 2020-10-14 22:57:04 +03:00 committed by Jouni Malinen
parent c3f37c35f0
commit 39748963d7
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/eap_peer/Makefile
View file

@ -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 CFLAGS += -DIEEE8021X_EAPOL
LIB_OBJS= \ LIB_OBJS= \
@ -11,3 +5,9 @@ LIB_OBJS= \
eap_methods.o eap_methods.o
include ../lib.rules 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

5
src/lib.rules
View file

@ -19,8 +19,11 @@ $(ALL): $(LIB_OBJS)
@$(E) " AR $(notdir $@)" @$(E) " AR $(notdir $@)"
$(Q)$(AR) crT $@ $? $(Q)$(AR) crT $@ $?
install: install-default:
@echo Nothing to be made. @echo Nothing to be made.
%: %-default
@true
clean: clean:
$(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL) $(Q)rm -f *~ *.o *.d *.gcno *.gcda *.gcov $(ALL)