Fix building dynamic EAP peer modules

Strip directory name from the target in the pattern rule for dynamic
modules.  Remove dynamic modules on "make clean".

diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..2fcda6a645241b68f40b170a6fbe208ad50e1482 100644 (file)
--- a/src/eap_peer/Makefile
+++ b/src/eap_peer/Makefile
@@ -3,4 +3,4 @@ all:
 
 clean:
        for d in $(SUBDIRS); do make -C $$d clean; done
-       rm -f *~ *.o *.d
+       rm -f *~ *.o *.so *.d

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 87b6092feca9a6a46927c19a730d04fd41c4b625..052ba64cb39ee3e0b89376a31a13eced8bd81cb0 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1157,7 +1157,7 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com
 
 %.so: %.c
        $(CC) -o $@ $(CFLAGS) -shared -rdynamic -fPIC $< \
-               -D$(*:eap_%=eap_peer_%)_register=eap_peer_method_dynamic_init
+               -D$(*F:eap_%=eap_peer_%)_register=eap_peer_method_dynamic_init
 
 
 wpa_supplicant.exe: wpa_supplicant