From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 18 May 2022 19:16:44 +0000 (-0500)
Subject: Add $(E) suffix for executable targets and $(L) suffix for dynamic libraries
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517ae342f611639e9f2efb8a163e6fa829589c63;p=thirdparty%2Ffreeradius-server.git

Add $(E) suffix for executable targets and $(L) suffix for dynamic libraries
---

diff --git a/src/bin/dhcpclient.mk b/src/bin/dhcpclient.mk
index 909407e99df..0f90fbae1c3 100644
--- a/src/bin/dhcpclient.mk
+++ b/src/bin/dhcpclient.mk
@@ -1,5 +1,5 @@
-TARGET		:= dhcpclient
+TARGET		:= dhcpclient$(E)
 SOURCES		:= dhcpclient.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a
+TGT_PREREQS	:= libfreeradius-dhcpv4$(L)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/fuzzer.mk b/src/bin/fuzzer.mk
index 08a9d96f935..1c916347607 100644
--- a/src/bin/fuzzer.mk
+++ b/src/bin/fuzzer.mk
@@ -17,10 +17,10 @@
 #  then magically turns into different fuzzers.
 #
 
-TARGET			:= fuzzer_$(PROTOCOL)
+TARGET			:= fuzzer_$(PROTOCOL)$(E)
 SOURCES			:= fuzzer.c
 
-TGT_PREREQS		:= libfreeradius-$(PROTOCOL).a
+TGT_PREREQS		:= libfreeradius-$(PROTOCOL)$(L)
 
 TGT_CFLAGS		:= -fsanitize=fuzzer
 TGT_LDFLAGS		:= -fsanitize=fuzzer
diff --git a/src/bin/radclient.mk b/src/bin/radclient.mk
index 0db0a8af07d..3132f556014 100644
--- a/src/bin/radclient.mk
+++ b/src/bin/radclient.mk
@@ -1,8 +1,8 @@
-TARGET		:= radclient
+TARGET		:= radclient$(E)
 SOURCES		:= radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
 		   ${top_srcdir}/src/modules/rlm_mschap/mschap.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 
 SRC_CFLAGS	:= -I${top_srcdir}/src/modules/rlm_mschap
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radict.mk b/src/bin/radict.mk
index 2d38f70ef94..7e526addcef 100644
--- a/src/bin/radict.mk
+++ b/src/bin/radict.mk
@@ -1,5 +1,5 @@
-TARGET		:= radict
+TARGET		:= radict$(E)
 SOURCES		:= radict.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index 5820be92925..0dd3fc8d963 100644
--- a/src/bin/radiusd.mk
+++ b/src/bin/radiusd.mk
@@ -1,14 +1,14 @@
-TARGET	:= radiusd
-SOURCES := \
-    radiusd.c \
-    radmin.c
+TARGET		:= radiusd$(E)
+SOURCES		:= \
+    			radiusd.c \
+    			radmin.c
 
 SRC_CFLAGS	:= $(LIBREADLINE_CFLAGS)
 
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(LIBS) $(SYSTEMD_LIBS) $(LIBREADLINE) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(LIBREADLINE_LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
 ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
diff --git a/src/bin/radlock.mk b/src/bin/radlock.mk
index 3eda4fa96c4..09845d197be 100644
--- a/src/bin/radlock.mk
+++ b/src/bin/radlock.mk
@@ -1,7 +1,12 @@
-TARGET		:= radlock
+ifneq (${TARGET_IS_WASM},yes)
+TARGET		:= radlock$(E)
+else
+TARGET		:=
+endif
+
 SOURCES		:= radlock.c
 
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/bin/radsizes.mk b/src/bin/radsizes.mk
index bacd913bff7..b2ed1d2c185 100644
--- a/src/bin/radsizes.mk
+++ b/src/bin/radsizes.mk
@@ -1,4 +1,4 @@
-TARGET		:= radsizes
+TARGET		:= radsizes$(E)
 SOURCES		:= radsizes.c
 TGT_LDLIBS	:= $(LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS)
diff --git a/src/bin/radsniff.mk b/src/bin/radsniff.mk
index 2b8601812fd..c04bc718f3d 100644
--- a/src/bin/radsniff.mk
+++ b/src/bin/radsniff.mk
@@ -1,11 +1,11 @@
 ifneq ($(PCAP_LIBS),)
-TARGET		:= radsniff
+TARGET		:= radsniff$(E)
 else
 TARGET		:=
 endif
 
 SOURCES		:= radsniff.c collectd.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
 TGT_LDFLAGS     := $(LDFLAGS) $(PCAP_LDFLAGS) $(COLLECTDC_LDFLAGS)
diff --git a/src/bin/radsnmp.mk b/src/bin/radsnmp.mk
index f7715e5bf5f..82ba80b1eca 100644
--- a/src/bin/radsnmp.mk
+++ b/src/bin/radsnmp.mk
@@ -1,6 +1,5 @@
-TARGET		:= radsnmp
+TARGET		:= radsnmp$(E)
 SOURCES		:= radsnmp.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
-
+TGT_PREREQS	:= libfreeradius-radius$(L)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radwho.mk b/src/bin/radwho.mk
index de142720c9b..089cfe55cbc 100644
--- a/src/bin/radwho.mk
+++ b/src/bin/radwho.mk
@@ -1,4 +1,4 @@
-TARGET		:= radwho
+TARGET		:= radwho$(E)
 SOURCES		:= radwho.c
 
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
diff --git a/src/bin/unit_test_attribute.mk b/src/bin/unit_test_attribute.mk
index 7202a7e300b..09c7d6e3b97 100644
--- a/src/bin/unit_test_attribute.mk
+++ b/src/bin/unit_test_attribute.mk
@@ -1,4 +1,4 @@
-TARGET		:= unit_test_attribute
+TARGET		:= unit_test_attribute$(E)
 SOURCES		:= unit_test_attribute.c
 
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
diff --git a/src/bin/unit_test_map.mk b/src/bin/unit_test_map.mk
index c9a96cec5ad..d6450cca155 100644
--- a/src/bin/unit_test_map.mk
+++ b/src/bin/unit_test_map.mk
@@ -1,4 +1,4 @@
-TARGET		:= unit_test_map
+TARGET		:= unit_test_map$(E)
 SOURCES		:= unit_test_map.c
 
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
diff --git a/src/bin/unit_test_module.mk b/src/bin/unit_test_module.mk
index 7cbf3e20b06..0873ef1bac1 100644
--- a/src/bin/unit_test_module.mk
+++ b/src/bin/unit_test_module.mk
@@ -1,9 +1,9 @@
-TARGET	:= unit_test_module
-SOURCES := unit_test_module.c
+TARGET		:= unit_test_module$(E)
+SOURCES 	:= unit_test_module.c
 
 TGT_INSTALLDIR  :=
 TGT_LDLIBS	:= $(LIBS) $(LCRYPT)
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
 ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
@@ -13,7 +13,7 @@ endif
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...
 ifneq "$(filter rlm_eap_%,${ALL_TGTS})" ""
-TGT_PREREQS	+= libfreeradius-eap.a
+TGT_PREREQS	+= libfreeradius-eap$(L)
 endif
 
 ifneq ($(MAKECMDGOALS),scan)
diff --git a/src/lib/curl/all.mk.in b/src/lib/curl/all.mk.in
index e5d1d13ba2c..70054f57747 100644
--- a/src/lib/curl/all.mk.in
+++ b/src/lib/curl/all.mk.in
@@ -2,7 +2,7 @@ TARGETNAME	:= @targetname@
 VERSION		:= @version@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c io.c
diff --git a/src/lib/eap/all.mk b/src/lib/eap/all.mk
index 0f53d4a8e39..b2086a41d2a 100644
--- a/src/lib/eap/all.mk
+++ b/src/lib/eap/all.mk
@@ -1,4 +1,4 @@
-TARGET := libfreeradius-eap.a
+TARGET := libfreeradius-eap$(L)
 
 SOURCES	:=		\
 	base.c		\
@@ -11,5 +11,5 @@ ifneq (${OPENSSL_LIBS},)
 SOURCES		+= tls.c crypto.c
 endif
 
-TGT_PREREQS	:= libfreeradius-util.la libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-radius$(L)
 SRC_CFLAGS	:= -DEAPLIB
diff --git a/src/lib/eap_aka_sim/all.mk b/src/lib/eap_aka_sim/all.mk
index 145f7010e81..ace7108c82c 100644
--- a/src/lib/eap_aka_sim/all.mk
+++ b/src/lib/eap_aka_sim/all.mk
@@ -1,5 +1,5 @@
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET := libfreeradius-eap-aka-sim.a
+TARGET := libfreeradius-eap-aka-sim$(L)
 endif
 
 SOURCES	:= \
@@ -14,4 +14,4 @@ SOURCES	:= \
 	vector.c \
 	xlat.c
 
-TGT_PREREQS	:= libfreeradius-util.la $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a
+TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER) libfreeradius-eap$(L) libfreeradius-sim$(L)
diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 68ba44c7497..aa1fa0852b6 100644
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -1,4 +1,4 @@
-TARGET	:= libfreeradius-io.a
+TARGET	:= libfreeradius-io$(L)
 
 SOURCES	:= \
 	app_io.c \
@@ -14,7 +14,7 @@ SOURCES	:= \
 	schedule.c \
 	worker.c
 
-TGT_PREREQS	:= libfreeradius-util.la $(LIBFREERADIUS_SERVER)
+TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
 TGT_LDLIBS	:= $(LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS)
 
diff --git a/src/lib/json/all.mk.in b/src/lib/json/all.mk.in
index 1debca6909f..4989c92ef32 100644
--- a/src/lib/json/all.mk.in
+++ b/src/lib/json/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= json.c jpath.c
diff --git a/src/lib/ldap/all.mk.in b/src/lib/ldap/all.mk.in
index 9ff8e37a54a..22d057746c2 100644
--- a/src/lib/ldap/all.mk.in
+++ b/src/lib/ldap/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c bind.c connection.c control.c directory.c edir.c map.c referral.c start_tls.c state.c util.c @SASL@
diff --git a/src/lib/redis/all.mk.in b/src/lib/redis/all.mk.in
index 348977e6fab..7cb442a880c 100644
--- a/src/lib/redis/all.mk.in
+++ b/src/lib/redis/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= redis.c crc16.c cluster.c
diff --git a/src/lib/server/libfreeradius-server.mk b/src/lib/server/libfreeradius-server.mk
index 575d6dda586..28595187735 100644
--- a/src/lib/server/libfreeradius-server.mk
+++ b/src/lib/server/libfreeradius-server.mk
@@ -1,4 +1,4 @@
-TARGET		:= libfreeradius-server.a
+TARGET		:= libfreeradius-server$(L)
 
 SOURCES	:= \
 	auth.c \
@@ -52,10 +52,10 @@ TGT_LDLIBS	:= $(LIBS) $(SYSTEMD_LIBS) $(GPERFTOOLS_LIBS) $(LCRYPT)
 TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(GPERFTOOLS_LDFLAGS)
 
 ifneq ($(OPENSSL_LIBS),)
-TGT_PREREQS	:= libfreeradius-tls.a
+TGT_PREREQS	:= libfreeradius-tls$(L)
 endif
 
-TGT_PREREQS	+= libfreeradius-util.a
+TGT_PREREQS	+= libfreeradius-util$(L)
 
 ifneq ($(MAKECMDGOALS),scan)
 SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
diff --git a/src/lib/server/pair_server_tests.mk b/src/lib/server/pair_server_tests.mk
index 0a8d6f4f347..ed8e582b3d1 100644
--- a/src/lib/server/pair_server_tests.mk
+++ b/src/lib/server/pair_server_tests.mk
@@ -1,6 +1,6 @@
-TARGET      := pair_server_tests
-SOURCES     := pair_server_tests.c
+TARGET      	:= pair_server_tests$(E)
+SOURCES     	:= pair_server_tests.c
 
-TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
-TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS := libfreeradius-util.la libfreeradius-radius.a libfreeradius-server.a libfreeradius-unlang.a
+TGT_LDLIBS  	:= $(LIBS) $(GPERFTOOLS_LIBS)
+TGT_LDFLAGS 	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
+TGT_PREREQS 	:= libfreeradius-util$(L) libfreeradius-radius$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
diff --git a/src/lib/server/trunk_tests.mk b/src/lib/server/trunk_tests.mk
index 613de395310..71117cd6acc 100644
--- a/src/lib/server/trunk_tests.mk
+++ b/src/lib/server/trunk_tests.mk
@@ -1,13 +1,12 @@
-TARGET		:= trunk_tests
-
+TARGET		:= trunk_tests$(E)
 SOURCES		:= trunk_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
 
 ifneq ($(OPENSSL_LIBS),)
-TGT_PREREQS	:= libfreeradius-tls.a
+TGT_PREREQS	:= libfreeradius-tls$(L)
 endif
 
-TGT_PREREQS	+= libfreeradius-util.la libfreeradius-server.a libfreeradius-unlang.a
+TGT_PREREQS	+= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
 SRC_CFLAGS	+= -DTESTING_TRUNK
diff --git a/src/lib/sim/all.mk b/src/lib/sim/all.mk
index 3ebe9a2f7f9..9cd53a47e25 100644
--- a/src/lib/sim/all.mk
+++ b/src/lib/sim/all.mk
@@ -1,5 +1,5 @@
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET := libfreeradius-sim.a
+TARGET		:= libfreeradius-sim$(L)
 endif
 
 SOURCES	:= \
@@ -7,4 +7,4 @@ SOURCES	:= \
 	milenage.c \
 	ts_34_108.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/soh/all.mk b/src/lib/soh/all.mk
index ebbf70a5bd8..f5efab66a0f 100644
--- a/src/lib/soh/all.mk
+++ b/src/lib/soh/all.mk
@@ -1,8 +1,8 @@
 TARGETNAME	:= libfreeradius-soh
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= soh.c
-TGT_PREREQS	:= libfreeradius-util.la
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/tls/all.mk b/src/lib/tls/all.mk
index 9686a7301df..839347b4a67 100644
--- a/src/lib/tls/all.mk
+++ b/src/lib/tls/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= libfreeradius-tls
 
 ifneq ($(OPENSSL_LIBS),)
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES	:= \
@@ -20,7 +20,7 @@ SOURCES	:= \
 	version.c \
 	virtual_server.c
 
-TGT_PREREQS := libfreeradius-internal.a libfreeradius-util.a
+TGT_PREREQS := libfreeradius-internal$(L) libfreeradius-util$(L)
 
 # This lets the linker determine which version of the SSLeay functions to use.
 TGT_LDLIBS  := $(LIBS) $(OPENSSL_LIBS) $(GPERFTOOLS_LIBS)
diff --git a/src/lib/unlang/all.mk b/src/lib/unlang/all.mk
index 4b60200183f..de66bda6621 100644
--- a/src/lib/unlang/all.mk
+++ b/src/lib/unlang/all.mk
@@ -1,4 +1,4 @@
-TARGET		:= libfreeradius-unlang.a
+TARGET		:= libfreeradius-unlang$(L)
 
 SOURCES	:=	base.c \
 		call.c \
@@ -33,7 +33,7 @@ SOURCES	:=	base.c \
 
 HEADERS		:= $(subst src/lib/,,$(wildcard src/lib/unlang/*.h))
 
-TGT_PREREQS	:= libfreeradius-util.la libfreeradius-server.a
+TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L)
 
 ifneq ($(MAKECMDGOALS),scan)
 SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
diff --git a/src/lib/util/base_16_32_64_tests.mk b/src/lib/util/base_16_32_64_tests.mk
index 7614b790931..414c8f1ba20 100644
--- a/src/lib/util/base_16_32_64_tests.mk
+++ b/src/lib/util/base_16_32_64_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= base_16_32_64_tests
-
+TARGET		:= base_16_32_64_tests$(E)
 SOURCES		:= base_16_32_64_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/dbuff_tests.mk b/src/lib/util/dbuff_tests.mk
index ceb1d458a58..db5c6b8d0d9 100644
--- a/src/lib/util/dbuff_tests.mk
+++ b/src/lib/util/dbuff_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= dbuff_tests
-
+TARGET		:= dbuff_tests$(E)
 SOURCES		:= dbuff_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/dcursor_tests.mk b/src/lib/util/dcursor_tests.mk
index d30b0486c86..013b8eebc9e 100644
--- a/src/lib/util/dcursor_tests.mk
+++ b/src/lib/util/dcursor_tests.mk
@@ -1,5 +1,4 @@
-TARGET		:= dcursor_tests
-
+TARGET		:= dcursor_tests$(E)
 SOURCES		:= dcursor_tests.c
 
 # The cursor tests use manually created pairs rather than talloced ones
@@ -7,4 +6,4 @@ SOURCES		:= dcursor_tests.c
 SRC_CFLAGS	:= -DTALLOC_GET_TYPE_ABORT_NOOP
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/dict_wasm.mk b/src/lib/util/dict_wasm.mk
deleted file mode 100644
index 48f8336d8be..00000000000
--- a/src/lib/util/dict_wasm.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET		:= dict.wasm
-
-SRC_CC          := emcc
-SRC_CFLAGS      := ''
-
-SOURCES		:= dict_ext.c \
-		   dict_fixup.c \
-		   dict_print.c \
-		   dict_tokenize.c \
-		   dict_unknown.c \
-		   dict_util.c \
diff --git a/src/lib/util/dlist_tests.mk b/src/lib/util/dlist_tests.mk
index 7382d4def40..45b9fd2c9a0 100644
--- a/src/lib/util/dlist_tests.mk
+++ b/src/lib/util/dlist_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= dlist_tests
-
+TARGET		:= dlist_tests$(E)
 SOURCES		:= dlist_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/edit_tests.mk b/src/lib/util/edit_tests.mk
index be5d4e49c42..453b172aff2 100644
--- a/src/lib/util/edit_tests.mk
+++ b/src/lib/util/edit_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= edit_tests
-
+TARGET		:= edit_tests$(E)
 SOURCES		:= edit_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/heap_tests.mk b/src/lib/util/heap_tests.mk
index 504c22880c8..fd95ce67db4 100644
--- a/src/lib/util/heap_tests.mk
+++ b/src/lib/util/heap_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= heap_tests
-
+TARGET		:= heap_tests$(E)
 SOURCES		:= heap_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/hmac_tests.mk b/src/lib/util/hmac_tests.mk
index 3a6cbf22733..d116dfd090c 100644
--- a/src/lib/util/hmac_tests.mk
+++ b/src/lib/util/hmac_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= hmac_tests
-
+TARGET		:= hmac_tests$(E)
 SOURCES		:= hmac_tests.c
 
 TGT_LDLIBS	:= $(LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/libfreeradius-util.mk b/src/lib/util/libfreeradius-util.mk
index 389d45efdf2..ecf4269400a 100644
--- a/src/lib/util/libfreeradius-util.mk
+++ b/src/lib/util/libfreeradius-util.mk
@@ -3,7 +3,7 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-util.a
+TARGET		:= libfreeradius-util$(L)
 
 SOURCES		:= \
 		   atexit.c \
@@ -104,3 +104,9 @@ SRC_CFLAGS	:= -D_LIBRADIUS -DNO_ASSERT -I$(top_builddir)/src
 # like pthread and the regexp libraries.
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(PCAP_LDFLAGS)
+
+ifeq "$(TARGET_IS_WASM)" "yes"
+SRC_CFLAGS      += -sMAIN_MODULE=1 -sUSE_PTHREADS=1
+TGT_LDLIBS      += --no-entry
+endif
+
diff --git a/src/lib/util/lst_tests.mk b/src/lib/util/lst_tests.mk
index e84ec9e15c3..6802f7c4778 100644
--- a/src/lib/util/lst_tests.mk
+++ b/src/lib/util/lst_tests.mk
@@ -1,8 +1,7 @@
-TARGET		:= lst_tests
-
+TARGET		:= lst_tests$(E)
 SOURCES		:= lst_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
 
-TGT_PREREQS	+= libfreeradius-util.a
+TGT_PREREQS	+= libfreeradius-util$(L)
diff --git a/src/lib/util/minmax_heap_tests.mk b/src/lib/util/minmax_heap_tests.mk
index 3c43eb1249e..f87ef047258 100644
--- a/src/lib/util/minmax_heap_tests.mk
+++ b/src/lib/util/minmax_heap_tests.mk
@@ -1,8 +1,7 @@
-TARGET		:= minmax_heap_tests
-
+TARGET		:= minmax_heap_tests$(E)
 SOURCES		:= minmax_heap_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
 
-TGT_PREREQS	+= libfreeradius-util.a
+TGT_PREREQS	+= libfreeradius-util$(L)
diff --git a/src/lib/util/pair_legacy_tests.mk b/src/lib/util/pair_legacy_tests.mk
index 35fb6e010c5..3ecd2396d54 100644
--- a/src/lib/util/pair_legacy_tests.mk
+++ b/src/lib/util/pair_legacy_tests.mk
@@ -1,6 +1,6 @@
-TARGET      := pair_legacy_tests
+TARGET      := pair_legacy_tests$(E)
 SOURCES     := pair_legacy_tests.c
 
 TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS := libfreeradius-util.la libfreeradius-radius.a
+TGT_PREREQS := libfreeradius-util$(L) libfreeradius-radius$(L)
diff --git a/src/lib/util/pair_list_perf_test.mk b/src/lib/util/pair_list_perf_test.mk
index 0eccbfad97e..fde9156684b 100644
--- a/src/lib/util/pair_list_perf_test.mk
+++ b/src/lib/util/pair_list_perf_test.mk
@@ -1,6 +1,6 @@
-TARGET := pair_list_perf_test
-SOURCES := pair_list_perf_test.c
+TARGET		:= pair_list_perf_test$(E)
+SOURCES		:= pair_list_perf_test.c
 
 TGT_INSTALLDIR	:=
 TGT_LDLIBS	:= $(LIBS)
-TGT_PREREQS	:= libfreeradius-util.la
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/pair_tests.mk b/src/lib/util/pair_tests.mk
index b038143d688..ca5e3c96957 100644
--- a/src/lib/util/pair_tests.mk
+++ b/src/lib/util/pair_tests.mk
@@ -1,6 +1,6 @@
-TARGET      := pair_tests
-SOURCES     := pair_tests.c
+TARGET      	:= pair_tests$(E)
+SOURCES    	:= pair_tests.c
 
-TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
-TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS := libfreeradius-util.la libfreeradius-radius.a
+TGT_LDLIBS  	:= $(LIBS) $(GPERFTOOLS_LIBS)
+TGT_LDFLAGS 	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
+TGT_PREREQS 	:= libfreeradius-util$(L) libfreeradius-radius$(L)
diff --git a/src/lib/util/rb_tests.mk b/src/lib/util/rb_tests.mk
index 479c35b1746..4a73b1203fa 100644
--- a/src/lib/util/rb_tests.mk
+++ b/src/lib/util/rb_tests.mk
@@ -1,6 +1,6 @@
-TARGET      := rb_tests
-SOURCES     := rb_tests.c
+TARGET      	:= rb_tests$(E)
+SOURCES     	:= rb_tests.c
 
-TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
-TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS := libfreeradius-util.a
+TGT_LDLIBS  	:= $(LIBS) $(GPERFTOOLS_LIBS)
+TGT_LDFLAGS 	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
+TGT_PREREQS 	:= libfreeradius-util$(L)
diff --git a/src/lib/util/sbuff_tests.mk b/src/lib/util/sbuff_tests.mk
index b112c176404..6ec728e9884 100644
--- a/src/lib/util/sbuff_tests.mk
+++ b/src/lib/util/sbuff_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= sbuff_tests
-
+TARGET		:= sbuff_tests$(E)
 SOURCES		:= sbuff_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/strerror_tests.mk b/src/lib/util/strerror_tests.mk
index 4a6fc9e5325..6bfeca87423 100644
--- a/src/lib/util/strerror_tests.mk
+++ b/src/lib/util/strerror_tests.mk
@@ -1,7 +1,6 @@
-TARGET		:= strerror_tests
-
+TARGET		:= strerror_tests$(E)
 SOURCES		:= strerror_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/lib/util/trie.mk b/src/lib/util/trie.mk
index 60bb56169f9..4b02ed8ea7b 100644
--- a/src/lib/util/trie.mk
+++ b/src/lib/util/trie.mk
@@ -1,6 +1,6 @@
-TARGET		:= trie
+TARGET		:= trie$(E)
 
 SRC_CFLAGS	:= -DTESTING
 SOURCES		:= trie.c
 TGT_LDLIBS	:= $(LIBS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/listen/arp/proto_arp.mk b/src/listen/arp/proto_arp.mk
index 091bdd49bee..b4a482593dd 100644
--- a/src/listen/arp/proto_arp.mk
+++ b/src/listen/arp/proto_arp.mk
@@ -4,9 +4,9 @@ TARGETNAME	:= proto_arp
 #  ARP depends on pcap.
 #
 ifneq "$(PCAP_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_arp.c
-TGT_PREREQS	:= libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-arp$(L)
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/listen/arp/proto_arp_ethernet.mk b/src/listen/arp/proto_arp_ethernet.mk
index fce6319e254..e028a9edd78 100644
--- a/src/listen/arp/proto_arp_ethernet.mk
+++ b/src/listen/arp/proto_arp_ethernet.mk
@@ -4,9 +4,9 @@ TARGETNAME := proto_arp_ethernet
 #  ARP depends on pcap.
 #
 ifneq "$(PCAP_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_arp_ethernet.c
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/listen/control/libfreeradius-control.mk b/src/listen/control/libfreeradius-control.mk
index e1aebba60b5..95708c18a80 100644
--- a/src/listen/control/libfreeradius-control.mk
+++ b/src/listen/control/libfreeradius-control.mk
@@ -1,5 +1,5 @@
-TARGET		:= libfreeradius-control.a
+TARGET		:= libfreeradius-control$(L)
 
 SOURCES		:= conduit.c
 
-SRC_CFLAGS	:= 
+SRC_CFLAGS	:=
diff --git a/src/listen/control/proto_control.mk b/src/listen/control/proto_control.mk
index 3499638644d..2b905eff322 100644
--- a/src/listen/control/proto_control.mk
+++ b/src/listen/control/proto_control.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_control
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_control.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius$(L) libfreeradius-io$(L)
diff --git a/src/listen/control/proto_control_unix.mk b/src/listen/control/proto_control_unix.mk
index 4c5e530e9c3..a5ff0557d48 100644
--- a/src/listen/control/proto_control_unix.mk
+++ b/src/listen/control/proto_control_unix.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_control_unix
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_control_unix.c
 
-TGT_PREREQS	:= libfreeradius-control.a
+TGT_PREREQS	:= libfreeradius-control$(L)
diff --git a/src/listen/control/radmin.mk b/src/listen/control/radmin.mk
index 330917e7ab3..34a9cb7ce04 100644
--- a/src/listen/control/radmin.mk
+++ b/src/listen/control/radmin.mk
@@ -9,6 +9,6 @@ SOURCES		:= radmin.c
 SRC_CFLAGS	:= $(LIBREADLINE_CFLAGS)
 
 TGT_INSTALLDIR  := ${sbindir}
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-control.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-control$(L)
 TGT_LDLIBS	:= $(LIBS) $(LIBREADLINE)
 TGT_LDFLAGS	:= $(LDFLAGS) $(LIBREADLINE_LDFLAGS)
diff --git a/src/listen/cron/proto_cron.mk b/src/listen/cron/proto_cron.mk
index 10ebde9b4fd..636f10705d1 100644
--- a/src/listen/cron/proto_cron.mk
+++ b/src/listen/cron/proto_cron.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_cron
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_cron.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
diff --git a/src/listen/cron/proto_cron_crontab.mk b/src/listen/cron/proto_cron_crontab.mk
index 7dd34d54ad8..80c1113abb3 100644
--- a/src/listen/cron/proto_cron_crontab.mk
+++ b/src/listen/cron/proto_cron_crontab.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_cron_crontab
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_cron_crontab.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/listen/detail/proto_detail.mk b/src/listen/detail/proto_detail.mk
index c161ae84345..669bd3f4ca3 100644
--- a/src/listen/detail/proto_detail.mk
+++ b/src/listen/detail/proto_detail.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_detail
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_detail.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
diff --git a/src/listen/detail/proto_detail_file.mk b/src/listen/detail/proto_detail_file.mk
index 651c28ff4c8..fae6fcf6268 100644
--- a/src/listen/detail/proto_detail_file.mk
+++ b/src/listen/detail/proto_detail_file.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_detail_file
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_detail_file.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/listen/detail/proto_detail_work.mk b/src/listen/detail/proto_detail_work.mk
index d6c57fe5b6f..f8d42a4d051 100644
--- a/src/listen/detail/proto_detail_work.mk
+++ b/src/listen/detail/proto_detail_work.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_detail_work
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_detail_work.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/listen/dhcpv4/proto_dhcpv4.mk b/src/listen/dhcpv4/proto_dhcpv4.mk
index 11d7cb34834..496dfd0e1e2 100644
--- a/src/listen/dhcpv4/proto_dhcpv4.mk
+++ b/src/listen/dhcpv4/proto_dhcpv4.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dhcpv4
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dhcpv4.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-dhcpv4$(L) libfreeradius-io$(L)
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.mk b/src/listen/dhcpv4/proto_dhcpv4_udp.mk
index 9227273df8c..90811fc4101 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.mk
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dhcpv4_udp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dhcpv4_udp.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-dhcpv4$(L) libfreeradius-arp$(L)
diff --git a/src/listen/dhcpv6/proto_dhcpv6.mk b/src/listen/dhcpv6/proto_dhcpv6.mk
index 8eddf3fdff0..a7a744af107 100644
--- a/src/listen/dhcpv6/proto_dhcpv6.mk
+++ b/src/listen/dhcpv6/proto_dhcpv6.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dhcpv6
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dhcpv6.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv6.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-dhcpv6$(L) libfreeradius-io$(L)
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.mk b/src/listen/dhcpv6/proto_dhcpv6_udp.mk
index 3bf88b7d410..770bd1220c0 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.mk
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dhcpv6_udp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dhcpv6_udp.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv6.a
+TGT_PREREQS	:= libfreeradius-dhcpv6$(L)
diff --git a/src/listen/dns/proto_dns.mk b/src/listen/dns/proto_dns.mk
index 2d9b1f90319..e8587ddf29c 100644
--- a/src/listen/dns/proto_dns.mk
+++ b/src/listen/dns/proto_dns.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dns
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dns.c
 
-TGT_PREREQS	:= libfreeradius-dns.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-dns$(L) libfreeradius-io$(L)
diff --git a/src/listen/dns/proto_dns_udp.mk b/src/listen/dns/proto_dns_udp.mk
index 71a0ee01ba9..aa24af7e826 100644
--- a/src/listen/dns/proto_dns_udp.mk
+++ b/src/listen/dns/proto_dns_udp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_dns_udp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_dns_udp.c
 
-TGT_PREREQS	:= libfreeradius-dns.a
+TGT_PREREQS	:= libfreeradius-dns$(L)
diff --git a/src/listen/load/proto_load.mk b/src/listen/load/proto_load.mk
index 0c52e918fe6..27841500350 100644
--- a/src/listen/load/proto_load.mk
+++ b/src/listen/load/proto_load.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_load
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_load.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
diff --git a/src/listen/load/proto_load_step.mk b/src/listen/load/proto_load_step.mk
index 97a609970a3..281683578ba 100644
--- a/src/listen/load/proto_load_step.mk
+++ b/src/listen/load/proto_load_step.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_load_step
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_load_step.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/listen/radius/proto_radius.mk b/src/listen/radius/proto_radius.mk
index 190580b7eb9..c1b16b8c503 100644
--- a/src/listen/radius/proto_radius.mk
+++ b/src/listen/radius/proto_radius.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_radius
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_radius.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius$(L) libfreeradius-io$(L)
diff --git a/src/listen/radius/proto_radius_tcp.mk b/src/listen/radius/proto_radius_tcp.mk
index e092b0b15cb..6c84f850c1a 100644
--- a/src/listen/radius/proto_radius_tcp.mk
+++ b/src/listen/radius/proto_radius_tcp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_radius_tcp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_radius_tcp.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
diff --git a/src/listen/radius/proto_radius_udp.mk b/src/listen/radius/proto_radius_udp.mk
index b772bc3e643..a39cca96890 100644
--- a/src/listen/radius/proto_radius_udp.mk
+++ b/src/listen/radius/proto_radius_udp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_radius_udp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_radius_udp.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
diff --git a/src/listen/tacacs/proto_tacacs.mk b/src/listen/tacacs/proto_tacacs.mk
index 624a451e2ba..cd7a4922475 100644
--- a/src/listen/tacacs/proto_tacacs.mk
+++ b/src/listen/tacacs/proto_tacacs.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_tacacs
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_tacacs.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-tacacs.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-tacacs$(L) libfreeradius-io$(L)
diff --git a/src/listen/tacacs/proto_tacacs_tcp.mk b/src/listen/tacacs/proto_tacacs_tcp.mk
index 794a518bd41..7f16c922c38 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.mk
+++ b/src/listen/tacacs/proto_tacacs_tcp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_tacacs_tcp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_tacacs_tcp.c
 
-TGT_PREREQS	:= libfreeradius-tacacs.a
+TGT_PREREQS	:= libfreeradius-tacacs$(L)
diff --git a/src/listen/vmps/proto_vmps.mk b/src/listen/vmps/proto_vmps.mk
index a93f3397990..d7548dafc56 100644
--- a/src/listen/vmps/proto_vmps.mk
+++ b/src/listen/vmps/proto_vmps.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_vmps
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_vmps.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-vmps.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-vmps$(L) libfreeradius-io$(L)
diff --git a/src/listen/vmps/proto_vmps_udp.mk b/src/listen/vmps/proto_vmps_udp.mk
index e3182d1c60c..86b34acf7cb 100644
--- a/src/listen/vmps/proto_vmps_udp.mk
+++ b/src/listen/vmps/proto_vmps_udp.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= proto_vmps_udp
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_vmps_udp.c
 
-TGT_PREREQS	:= libfreeradius-vmps.a
+TGT_PREREQS	:= libfreeradius-vmps$(L)
diff --git a/src/modules/proto_bfd/all.mk b/src/modules/proto_bfd/all.mk
index f6a368ad1cb..6bf31d47995 100644
--- a/src/modules/proto_bfd/all.mk
+++ b/src/modules/proto_bfd/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= proto_bfd
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= proto_bfd.c
diff --git a/src/modules/proto_ldap_sync/all.mk b/src/modules/proto_ldap_sync/all.mk
index 4ce24eb6a44..12544946d5a 100644
--- a/src/modules/proto_ldap_sync/all.mk
+++ b/src/modules/proto_ldap_sync/all.mk
@@ -6,8 +6,8 @@ TARGETNAME=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= proto_ldap_sync
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c sync.c
-TGT_PREREQS	:= libfreeradius-ldap.a
+TGT_PREREQS	:= libfreeradius-ldap$(L)
diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.mk b/src/modules/proto_ldap_sync/proto_ldap_sync.mk
index 099c7f30a00..c3b2090962b 100644
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.mk
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.mk
@@ -10,4 +10,4 @@ ifneq "${TARGETNAME}" ""
 endif
 
 SOURCES		:= $(TARGETNAME).c
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-ldap.a
+TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-ldap$(L)
diff --git a/src/modules/proto_ldap_sync/sync_touch.mk b/src/modules/proto_ldap_sync/sync_touch.mk
index 4ce24eb6a44..12544946d5a 100644
--- a/src/modules/proto_ldap_sync/sync_touch.mk
+++ b/src/modules/proto_ldap_sync/sync_touch.mk
@@ -6,8 +6,8 @@ TARGETNAME=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= proto_ldap_sync
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c sync.c
-TGT_PREREQS	:= libfreeradius-ldap.a
+TGT_PREREQS	:= libfreeradius-ldap$(L)
diff --git a/src/modules/rlm_always/all.mk b/src/modules/rlm_always/all.mk
index 82e66bac25b..3f653951385 100644
--- a/src/modules/rlm_always/all.mk
+++ b/src/modules/rlm_always/all.mk
@@ -1,3 +1,4 @@
-TARGET		:= rlm_always.a
+TARGETNAME	:= rlm_always
+TARGET		:= $(TARGETNAME)$(L)
 SOURCES		:= rlm_always.c
 LOG_ID_LIB	= 1
diff --git a/src/modules/rlm_attr_filter/all.mk b/src/modules/rlm_attr_filter/all.mk
index 5e3bdaa2a16..1d32bfe4696 100644
--- a/src/modules/rlm_attr_filter/all.mk
+++ b/src/modules/rlm_attr_filter/all.mk
@@ -1,3 +1,4 @@
-TARGET		:= rlm_attr_filter.a
+TARGETNAME	:= rlm_attr_filter
+TARGET		:= $(TARGETNAME)$(L)
 SOURCES		:= rlm_attr_filter.c
 LOG_ID_LIB	= 2
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/all.mk.in b/src/modules/rlm_cache/drivers/rlm_cache_memcached/all.mk.in
index 8b720e22268..f7e38ad7d64 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/all.mk.in
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c ../../serialize.c
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/all.mk b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/all.mk
index 21f6ba7487a..c84f1759688 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/all.mk
+++ b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/all.mk
@@ -1,3 +1,4 @@
-TARGET		:= rlm_cache_rbtree.a
-SOURCES		:= rlm_cache_rbtree.c
-TGT_LDLIBS	:= $(LIBS)
+TARGETNAME	:= rlm_cache_rbtree
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/all.mk b/src/modules/rlm_cache/drivers/rlm_cache_redis/all.mk
index fd5cc7061dd..ae743ef6b9d 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/all.mk
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/all.mk
@@ -6,10 +6,10 @@ TARGETNAME:=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_cache_redis
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/redis
-TGT_PREREQS	:= libfreeradius-redis.a
+TGT_PREREQS	:= libfreeradius-redis$(L)
diff --git a/src/modules/rlm_cache/rlm_cache.mk b/src/modules/rlm_cache/rlm_cache.mk
index f03bdb97f14..16ecc7bfc6b 100644
--- a/src/modules/rlm_cache/rlm_cache.mk
+++ b/src/modules/rlm_cache/rlm_cache.mk
@@ -1,4 +1,6 @@
-TARGET		:= rlm_cache.a
-SOURCES		:= rlm_cache.c
-TGT_LDLIBS	:= $(LIBS)
+TARGETNAME	:= rlm_cache
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 3
diff --git a/src/modules/rlm_chap/all.mk b/src/modules/rlm_chap/all.mk
index a8ed727e64a..e716d22c956 100644
--- a/src/modules/rlm_chap/all.mk
+++ b/src/modules/rlm_chap/all.mk
@@ -1,5 +1,7 @@
-TARGET		:= rlm_chap.a
-SOURCES		:= rlm_chap.c
+TARGETNAME	:= rlm_chap
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
+TGT_PREREQS	:= libfreeradius-radius$(L)
 LOG_ID_LIB	= 4
diff --git a/src/modules/rlm_cipher/all.mk b/src/modules/rlm_cipher/all.mk
index 75fdb695158..f66fd403a97 100644
--- a/src/modules/rlm_cipher/all.mk
+++ b/src/modules/rlm_cipher/all.mk
@@ -14,7 +14,7 @@
 TARGETNAME	:= rlm_cipher
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_client/all.mk b/src/modules/rlm_client/all.mk
index 4966f978c0b..20ca2774b5a 100644
--- a/src/modules/rlm_client/all.mk
+++ b/src/modules/rlm_client/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_client.a
-SOURCES		:= rlm_client.c
-LOG_ID_LIB	= 6
+TARGETNAME	:= rlm_client
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
+LOG_ID_LIB	= 5
diff --git a/src/modules/rlm_couchbase/all.mk.in b/src/modules/rlm_couchbase/all.mk.in
index 6a1c318f40a..0c787b0a78d 100644
--- a/src/modules/rlm_couchbase/all.mk.in
+++ b/src/modules/rlm_couchbase/all.mk.in
@@ -12,7 +12,7 @@ ifneq "$(TARGETNAME)" ""
 
   #  Check the targetname from the local configure script
   ifneq "$(TARGETNAME)" ""
-    TARGET		:= $(TARGETNAME).a
+    TARGET		:= $(TARGETNAME)$(L)
   endif
 endif
 
diff --git a/src/modules/rlm_csv/all.mk b/src/modules/rlm_csv/all.mk
index f788ab1a757..66a31cfa460 100644
--- a/src/modules/rlm_csv/all.mk
+++ b/src/modules/rlm_csv/all.mk
@@ -1,3 +1,6 @@
-SOURCES		:= rlm_csv.c
-TARGET		:= rlm_csv.a
+TARGETNAME	:= rlm_csv
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 8
diff --git a/src/modules/rlm_date/all.mk b/src/modules/rlm_date/all.mk
index df8fd27ed30..41409fd3c22 100644
--- a/src/modules/rlm_date/all.mk
+++ b/src/modules/rlm_date/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_date.a
-SOURCES		:= rlm_date.c
+TARGETNAME	:= rlm_date
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 9
diff --git a/src/modules/rlm_delay/all.mk b/src/modules/rlm_delay/all.mk
index ec6e7caf2f9..758d179d43f 100644
--- a/src/modules/rlm_delay/all.mk
+++ b/src/modules/rlm_delay/all.mk
@@ -1,3 +1,6 @@
-SOURCES		:= rlm_delay.c
-TARGET		:= rlm_delay.a
+TARGETNAME	:= rlm_delay
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 10
diff --git a/src/modules/rlm_detail/all.mk b/src/modules/rlm_detail/all.mk
index d5c8ebd546a..4b0f036a4d8 100644
--- a/src/modules/rlm_detail/all.mk
+++ b/src/modules/rlm_detail/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_detail.a
-SOURCES		:= rlm_detail.c
+TARGETNAME	:= rlm_detail
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 11
diff --git a/src/modules/rlm_dhcpv4/all.mk b/src/modules/rlm_dhcpv4/all.mk
index 1154f804268..ab2d7557626 100644
--- a/src/modules/rlm_dhcpv4/all.mk
+++ b/src/modules/rlm_dhcpv4/all.mk
@@ -1,5 +1,7 @@
-TARGET		:= rlm_dhcpv4.a
-SOURCES		:= rlm_dhcpv4.c
+TARGETNAME	:= rlm_dhcpv4
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
+TGT_PREREQS	:= libfreeradius-dhcpv4$(L)
 LOG_ID_LIB	= 12
diff --git a/src/modules/rlm_dict/all.mk b/src/modules/rlm_dict/all.mk
index 1e77d38351b..ca4a62d3775 100644
--- a/src/modules/rlm_dict/all.mk
+++ b/src/modules/rlm_dict/all.mk
@@ -1,5 +1,6 @@
-TARGET		:= rlm_dict.a
-SOURCES		:= rlm_dict.c
+TARGETNAME	:= rlm_dict
 
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
 
 LOG_ID_LIB	= 13
diff --git a/src/modules/rlm_digest/all.mk b/src/modules/rlm_digest/all.mk
index 437f4d5a6e8..7ad3980881d 100644
--- a/src/modules/rlm_digest/all.mk
+++ b/src/modules/rlm_digest/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_digest.a
-SOURCES		:= rlm_digest.c
+TARGETNAME	:= rlm_digest
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 14
diff --git a/src/modules/rlm_eap/rlm_eap.mk b/src/modules/rlm_eap/rlm_eap.mk
index c0f40a5eafe..b9ad1b0a4b2 100644
--- a/src/modules/rlm_eap/rlm_eap.mk
+++ b/src/modules/rlm_eap/rlm_eap.mk
@@ -1,7 +1,9 @@
-TARGET		:= rlm_eap.a
-SOURCES		:= rlm_eap.c
+TARGETNAME	:= rlm_eap
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
 
 SRC_INCDIRS	:= . lib/base
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
 LOG_ID_LIB	= 15
diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/all.mk b/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
index 24256532025..318b33d0b33 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= rlm_eap_aka
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap$(L) libfreeradius-sim$(L) libfreeradius-eap-aka-sim$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk b/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
index 72a003a3611..d2acc20cfcd 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= rlm_eap_aka_prime
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap$(L) libfreeradius-sim$(L) libfreeradius-eap-aka-sim$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
index ae1d0e63996..c79dd63b99a 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
@@ -1,11 +1,11 @@
 TARGETNAME	:= rlm_eap_fast
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c eap_fast.c eap_fast_crypto.c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-tls.a libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-tls$(L) libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk b/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk
index 3731c62b452..13516ec1303 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= rlm_eap_gtc
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
@@ -10,4 +10,4 @@ SRC_CFLAGS	:=
 TGT_LDLIBS	:=
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/all.mk b/src/modules/rlm_eap/types/rlm_eap_md5/all.mk
index 3172d926f56..79811f3a280 100644
--- a/src/modules/rlm_eap/types/rlm_eap_md5/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= rlm_eap_md5
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c eap_md5.c
@@ -10,4 +10,4 @@ SRC_CFLAGS	:=
 TGT_LDLIBS	:=
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk b/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk
index 5d264cea8f7..7e214985332 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= rlm_eap_mschapv2
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
@@ -10,4 +10,4 @@ SRC_CFLAGS	:=
 TGT_LDLIBS	:=
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/all.mk b/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
index a38dae0e470..5c9c96f4b19 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
@@ -1,11 +1,11 @@
 TARGETNAME	:= rlm_eap_peap
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c peap.c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a libfreeradius-soh.a
+TGT_PREREQS	:= libfreeradius-eap$(L) libfreeradius-soh$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
index 9a21e1f8b48..c9c40003a61 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
@@ -1,11 +1,11 @@
 TARGETNAME	:= rlm_eap_pwd
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c eap_pwd.c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/all.mk b/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
index 5ae54713e1c..c8068aee134 100644
--- a/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= rlm_eap_sim
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap$(L) libfreeradius-sim$(L) libfreeradius-eap-aka-sim$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/all.mk b/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
index 106efa447e2..53f1b3dad47 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
@@ -1,11 +1,11 @@
 TARGETNAME	:= rlm_eap_tls
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk b/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
index f9b05a6d78c..76e914617ba 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
@@ -1,11 +1,11 @@
 TARGETNAME	:= rlm_eap_ttls
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c ttls.c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap$(L)
diff --git a/src/modules/rlm_escape/all.mk b/src/modules/rlm_escape/all.mk
index 7f42b379e7e..6d40c37960e 100644
--- a/src/modules/rlm_escape/all.mk
+++ b/src/modules/rlm_escape/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_escape.a
-SOURCES		:= rlm_escape.c
+TARGETNAME	:= rlm_escape
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 16
diff --git a/src/modules/rlm_exec/all.mk b/src/modules/rlm_exec/all.mk
index d08c26d2a0b..3253a83ce97 100644
--- a/src/modules/rlm_exec/all.mk
+++ b/src/modules/rlm_exec/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_exec.a
-SOURCES		:= rlm_exec.c
+TARGETNAME	:= rlm_exec
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 17
diff --git a/src/modules/rlm_expr/all.mk b/src/modules/rlm_expr/all.mk
index b6ca9b66189..d48c6b733cc 100644
--- a/src/modules/rlm_expr/all.mk
+++ b/src/modules/rlm_expr/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_expr.a
-SOURCES		:= rlm_expr.c
+TARGETNAME	:= rlm_expr
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 18
diff --git a/src/modules/rlm_files/all.mk b/src/modules/rlm_files/all.mk
index dd877b6b13e..91e482a8608 100644
--- a/src/modules/rlm_files/all.mk
+++ b/src/modules/rlm_files/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_files.a
-SOURCES		:= rlm_files.c
+TARGETNAME	:= rlm_files
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 19
diff --git a/src/modules/rlm_icmp/all.mk b/src/modules/rlm_icmp/all.mk
index b15a4ab6f44..0d304394460 100644
--- a/src/modules/rlm_icmp/all.mk
+++ b/src/modules/rlm_icmp/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_icmp.a
-SOURCES		:= rlm_icmp.c
+TARGETNAME	:= rlm_icmp
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 20
diff --git a/src/modules/rlm_idn/all.mk.in b/src/modules/rlm_idn/all.mk.in
index b910936f539..1bc69e75049 100644
--- a/src/modules/rlm_idn/all.mk.in
+++ b/src/modules/rlm_idn/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_imap/all.mk b/src/modules/rlm_imap/all.mk
index c6dd16ec36d..87c46c96384 100644
--- a/src/modules/rlm_imap/all.mk
+++ b/src/modules/rlm_imap/all.mk
@@ -5,8 +5,8 @@ TARGETNAME	:=
 TARGET		:=
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= rlm_imap.a
-TGT_PREREQS	+= libfreeradius-curl.a
+TARGET		:= rlm_imap$(L)
+TGT_PREREQS	+= libfreeradius-curl$(L)
 endif
 
 SOURCES		:= rlm_imap.c
diff --git a/src/modules/rlm_isc_dhcp/all.mk b/src/modules/rlm_isc_dhcp/all.mk
index 028ce5cd03d..b182523c210 100644
--- a/src/modules/rlm_isc_dhcp/all.mk
+++ b/src/modules/rlm_isc_dhcp/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_isc_dhcp.a
-SOURCES		:= rlm_isc_dhcp.c
+TARGETNAME	:= rlm_isc_dhcp
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 23
diff --git a/src/modules/rlm_json/all.mk b/src/modules/rlm_json/all.mk
index 4a047d06412..6699b63b989 100644
--- a/src/modules/rlm_json/all.mk
+++ b/src/modules/rlm_json/all.mk
@@ -6,7 +6,7 @@ TARGETNAME	:=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_json
-  TARGET        := $(TARGETNAME).a
+  TARGET        := $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
@@ -15,5 +15,5 @@ SOURCES		:= $(TARGETNAME).c
 #  Append SRC_CFLAGS and leave TGT_LDLIBS alone
 #
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/json/
-TGT_PREREQS	:= libfreeradius-json.a
+TGT_PREREQS	:= libfreeradius-json$(L)
 LOG_ID_LIB	= 24
diff --git a/src/modules/rlm_krb5/all.mk.in b/src/modules/rlm_krb5/all.mk.in
index 661d1c80798..04aaf2d28da 100644
--- a/src/modules/rlm_krb5/all.mk.in
+++ b/src/modules/rlm_krb5/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c krb5.c
diff --git a/src/modules/rlm_ldap/all.mk b/src/modules/rlm_ldap/all.mk
index 471af4b7ebc..e513142e0f7 100644
--- a/src/modules/rlm_ldap/all.mk
+++ b/src/modules/rlm_ldap/all.mk
@@ -6,11 +6,11 @@ TARGETNAME=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_ldap
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c groups.c user.c
 
 SRC_CFLAGS	+= -I$(top_builddir)/src/modules/rlm_ldap
-TGT_PREREQS	:= libfreeradius-ldap.a
+TGT_PREREQS	:= libfreeradius-ldap$(L)
 LOG_ID_LIB	= 26
diff --git a/src/modules/rlm_linelog/all.mk b/src/modules/rlm_linelog/all.mk
index ef28ac544ae..d87a3de7a6f 100644
--- a/src/modules/rlm_linelog/all.mk
+++ b/src/modules/rlm_linelog/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_linelog.a
-SOURCES		:= rlm_linelog.c
+TARGETNAME	:= rlm_linelog
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 27
diff --git a/src/modules/rlm_logintime/all.mk b/src/modules/rlm_logintime/all.mk
index bd660c284d1..6e678c1d392 100644
--- a/src/modules/rlm_logintime/all.mk
+++ b/src/modules/rlm_logintime/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_logintime.a
-SOURCES		:= rlm_logintime.c timestr.c
+TARGETNAME	:= rlm_logintime
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c timestr.c
+
 LOG_ID_LIB	= 28
diff --git a/src/modules/rlm_logtee/all.mk b/src/modules/rlm_logtee/all.mk
index f0c0dec1620..2720e2fc6e1 100644
--- a/src/modules/rlm_logtee/all.mk
+++ b/src/modules/rlm_logtee/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_logtee.a
-SOURCES		:= rlm_logtee.c
+TARGETNAME	:= rlm_logtee
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 29
diff --git a/src/modules/rlm_lua/libfreeradius-lua.mk.in b/src/modules/rlm_lua/libfreeradius-lua.mk.in
index 396b30b85ef..af6cc16ed5e 100644
--- a/src/modules/rlm_lua/libfreeradius-lua.mk.in
+++ b/src/modules/rlm_lua/libfreeradius-lua.mk.in
@@ -14,7 +14,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= libfreeradius-lua.a
+TARGET		:= libfreeradius-lua$(L)
 endif
 
 SOURCES		:= util.c
diff --git a/src/modules/rlm_lua/rlm_lua.mk.in b/src/modules/rlm_lua/rlm_lua.mk.in
index 37915f5541e..65c7929dddd 100644
--- a/src/modules/rlm_lua/rlm_lua.mk.in
+++ b/src/modules/rlm_lua/rlm_lua.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c lua.c
@@ -9,7 +9,7 @@ SOURCES		:= $(TARGETNAME).c lua.c
 SRC_CFLAGS	:= @lua_cflags@
 TGT_LDLIBS	:= @lua_ldflags@
 
-TGT_PREREQS	:= libfreeradius-lua.a
+TGT_PREREQS	:= libfreeradius-lua$(L)
 
 install: $(R)$(modconfdir)/lua/example.lua
 
diff --git a/src/modules/rlm_mruby/all.mk.in b/src/modules/rlm_mruby/all.mk.in
index c638cbc9ba3..9210fdd4b00 100644
--- a/src/modules/rlm_mruby/all.mk.in
+++ b/src/modules/rlm_mruby/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c mruby.c
diff --git a/src/modules/rlm_mschap/rlm_mschap.mk.in b/src/modules/rlm_mschap/rlm_mschap.mk.in
index 20cb003d40f..0f3747e1e47 100644
--- a/src/modules/rlm_mschap/rlm_mschap.mk.in
+++ b/src/modules/rlm_mschap/rlm_mschap.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c smbdes.c mschap.c @mschap_sources@
diff --git a/src/modules/rlm_mschap/smbencrypt.mk b/src/modules/rlm_mschap/smbencrypt.mk
index cb59241ea88..d80616a95b8 100644
--- a/src/modules/rlm_mschap/smbencrypt.mk
+++ b/src/modules/rlm_mschap/smbencrypt.mk
@@ -1,7 +1,7 @@
-TARGET		:= smbencrypt
+TARGET		:= smbencrypt$(E)
 SOURCES		:= smbencrypt.c smbdes.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 
 SRC_CFLAGS	:=
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/modules/rlm_opendirectory/all.mk.in b/src/modules/rlm_opendirectory/all.mk.in
index 20cad042934..0c6c0580fa2 100644
--- a/src/modules/rlm_opendirectory/all.mk.in
+++ b/src/modules/rlm_opendirectory/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_pam/all.mk.in b/src/modules/rlm_pam/all.mk.in
index 7f1c09d0145..e9eefadac6d 100644
--- a/src/modules/rlm_pam/all.mk.in
+++ b/src/modules/rlm_pam/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_pap/all.mk b/src/modules/rlm_pap/all.mk
index 2eabbe584c3..061879798c5 100644
--- a/src/modules/rlm_pap/all.mk
+++ b/src/modules/rlm_pap/all.mk
@@ -1,5 +1,7 @@
-SOURCES		:= rlm_pap.c
-TARGET		:= rlm_pap.a
+TARGETNAME	:= rlm_pap
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
 
 TGT_LDFLAGS	:= $(LCRYPT)
 LOG_ID_LIB	= 35
diff --git a/src/modules/rlm_passwd/all.mk b/src/modules/rlm_passwd/all.mk
index fa8c2d66cf0..d63f5207bff 100644
--- a/src/modules/rlm_passwd/all.mk
+++ b/src/modules/rlm_passwd/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_passwd.a
-SOURCES		:= rlm_passwd.c
+TARGETNAME	:= rlm_passwd
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 36
diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index 2b2cc44c919..8b077e11115 100644
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -1,10 +1,10 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
-SOURCES		:= rlm_perl.c
+SOURCES		:= $(TARGETNAME).c
 
 SRC_CFLAGS	:= @mod_cflags@
 TGT_LDLIBS	:= @mod_ldflags@
diff --git a/src/modules/rlm_python/all.mk.in b/src/modules/rlm_python/all.mk.in
index dbe5fd21b16..33d3fffdcf0 100644
--- a/src/modules/rlm_python/all.mk.in
+++ b/src/modules/rlm_python/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_radius/rlm_radius.mk b/src/modules/rlm_radius/rlm_radius.mk
index 956b4bafa48..0b29958a3f8 100644
--- a/src/modules/rlm_radius/rlm_radius.mk
+++ b/src/modules/rlm_radius/rlm_radius.mk
@@ -1,6 +1,7 @@
-TARGET		:= rlm_radius.a
+TARGETNAME	:= rlm_radius
+TARGET		:= $(TARGETNAME)$(L)
 
 SOURCES		:= rlm_radius.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 LOG_ID_LIB	= 39
diff --git a/src/modules/rlm_radius/rlm_radius_udp.mk b/src/modules/rlm_radius/rlm_radius_udp.mk
index 0c9a987ea00..dba1b03da6c 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.mk
+++ b/src/modules/rlm_radius/rlm_radius_udp.mk
@@ -1,5 +1,6 @@
-TARGET		:= rlm_radius_udp.a
+TARGETNAME	:= rlm_radius_udp
+TARGET		:= $(TARGETNAME)$(L)
 
 SOURCES		:= rlm_radius_udp.c track.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
diff --git a/src/modules/rlm_radutmp/all.mk.in b/src/modules/rlm_radutmp/all.mk.in
index 2b24474ef0e..adfeba7d8d1 100644
--- a/src/modules/rlm_radutmp/all.mk.in
+++ b/src/modules/rlm_radutmp/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_redis/all.mk b/src/modules/rlm_redis/all.mk
index 91ee2c606f7..3cbe57739fd 100644
--- a/src/modules/rlm_redis/all.mk
+++ b/src/modules/rlm_redis/all.mk
@@ -6,11 +6,11 @@ TARGETNAME=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_redis
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
 SRC_CFLAGS	+= -I$(top_builddir)/lib/redis/redis
-TGT_PREREQS	:= libfreeradius-redis.a
+TGT_PREREQS	:= libfreeradius-redis$(L)
 LOG_ID_LIB	= 41
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.mk b/src/modules/rlm_redis_ippool/rlm_redis_ippool.mk
index ad7ba088249..6c38c3ecee8 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.mk
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.mk
@@ -6,11 +6,11 @@ TARGETNAME=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_redis_ippool
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 endif
 
 SOURCES	:= $(TARGETNAME).c
 
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/redis
-TGT_PREREQS	:= libfreeradius-redis.a
+TGT_PREREQS	:= libfreeradius-redis$(L)
 LOG_ID_LIB	= 42
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
index 8474d192f9e..55088a74a1b 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
@@ -12,7 +12,7 @@ endif
 SOURCES		:= $(TARGETNAME).c
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/redis
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-redis.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-redis$(L)
 TGT_LDLIBS	+= $(TALLOC_LIBS) $(OPENSSL_LIBS)
 
 MAN		:= rlm_redis_ippool_tool.8
diff --git a/src/modules/rlm_rediswho/all.mk b/src/modules/rlm_rediswho/all.mk
index 6478893e0c6..b7eead6dcc2 100644
--- a/src/modules/rlm_rediswho/all.mk
+++ b/src/modules/rlm_rediswho/all.mk
@@ -6,7 +6,7 @@ TARGETNAME	:=
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_rediswho
-  TARGET        := $(TARGETNAME).a
+  TARGET        := $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
@@ -15,5 +15,5 @@ SOURCES		:= $(TARGETNAME).c
 #  Append SRC_CFLAGS and leave TGT_LDLIBS alone
 #
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/redis
-TGT_PREREQS	:= libfreeradius-redis.a
+TGT_PREREQS	:= libfreeradius-redis$(L)
 LOG_ID_LIB	= 43
diff --git a/src/modules/rlm_rest/all.mk b/src/modules/rlm_rest/all.mk
index abfa49338db..2b7d27bbaa8 100644
--- a/src/modules/rlm_rest/all.mk
+++ b/src/modules/rlm_rest/all.mk
@@ -6,7 +6,8 @@ TARGET		:=
 
 #  Add libfreeradius-json to the prereqs (so rlm_rest links to it)
 ifneq "$(TARGETNAME)" ""
-TGT_PREREQS	:= libfreeradius-json.a
+TGT_PREREQS	:= libfreeradius-jsonTARGETNAME	:= rlm_sometimes
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 #  Check to see if we libfreeradius-curl, as that's a hard dependency
@@ -16,8 +17,8 @@ TARGETNAME	:=
 TARGET		:=
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= rlm_rest.a
-TGT_PREREQS	+= libfreeradius-curl.a
+TARGET		:= rlm_rest$(L)
+TGT_PREREQS	+= libfreeradius-curl$(L)
 endif
 
 SOURCES		:= rlm_rest.c rest.c io.c
diff --git a/src/modules/rlm_securid/all.mk.in b/src/modules/rlm_securid/all.mk.in
index 6ad3d53ba73..7e94041f65a 100644
--- a/src/modules/rlm_securid/all.mk.in
+++ b/src/modules/rlm_securid/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c mem.c
diff --git a/src/modules/rlm_sigtran/all.mk.in b/src/modules/rlm_sigtran/all.mk.in
index 52de00bcc74..240c0e15b46 100644
--- a/src/modules/rlm_sigtran/all.mk.in
+++ b/src/modules/rlm_sigtran/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c \
diff --git a/src/modules/rlm_smtp/all.mk b/src/modules/rlm_smtp/all.mk
index d97a61c40bd..1aa406d2cef 100644
--- a/src/modules/rlm_smtp/all.mk
+++ b/src/modules/rlm_smtp/all.mk
@@ -23,17 +23,18 @@ TARGET		:=
 
 ifneq "$(TARGETNAME)" ""
 
-#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-version.${LIBRARY_EXT}
+#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-version.${LIB_EXT}
 
 #  Require cURL >= 7.56.0
 CURL_TOO_OLD := $(call ver.lt,$(VERSION),7.56.0)
 
 ifneq "$(CURL_TOO_OLD)" "T"
-TARGET		:= rlm_smtp.a
-TGT_PREREQS	+= libfreeradius-curl.a
+TARGETNAME	:= rlm_smtp
+TARGET		:= $(TARGETNAME)$(L)
+TGT_PREREQS	+= libfreeradius-curl$(L)
 endif
 
 endif
 
-SOURCES		:= rlm_smtp.c
+SOURCES		:= $(TARGETNAME).c
 LOG_ID_LIB	= 47
diff --git a/src/modules/rlm_soh/all.mk b/src/modules/rlm_soh/all.mk
index 5a74a006cab..f3085ec2d14 100644
--- a/src/modules/rlm_soh/all.mk
+++ b/src/modules/rlm_soh/all.mk
@@ -1,5 +1,7 @@
-TARGET		:= rlm_soh.a
-SOURCES		:= rlm_soh.c
+TARGETNAME	:= rlm_soh
 
-TGT_PREREQS	:= libfreeradius-soh.a
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
+TGT_PREREQS	:= libfreeradius-soh$(L)
 LOG_ID_LIB	= 48
diff --git a/src/modules/rlm_sometimes/all.mk b/src/modules/rlm_sometimes/all.mk
index 77266191290..b6053cea5dd 100644
--- a/src/modules/rlm_sometimes/all.mk
+++ b/src/modules/rlm_sometimes/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_sometimes.a
-SOURCES		:= rlm_sometimes.c
+TARGETNAME	:= rlm_sometimes
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 49
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/all.mk.in
index 97aecb6aca4..764a6bddda7 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_db2/all.mk.in
index 14ebb76e7fb..a963ba7ac17 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_firebird/all.mk.in
index d19085e206f..ce194b135f2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c sql_fbapi.c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_freetds/all.mk.in
index 30b13b20157..5e2ab5e496e 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_mysql/all.mk.in
index 6593b15730e..d76dc1217c3 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_null/all.mk b/src/modules/rlm_sql/drivers/rlm_sql_null/all.mk
index 22ea82b9cd8..eea98fc90e2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_null/all.mk
+++ b/src/modules/rlm_sql/drivers/rlm_sql_null/all.mk
@@ -1,4 +1,4 @@
-TARGET		= rlm_sql_null.a
+TARGET		= rlm_sql_null$(L)
 SOURCES		= rlm_sql_null.c
 
 SRC_CFLAGS	= -I${top_srcdir}/src/modules/rlm_sql
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_oracle/all.mk.in
index efe4f470840..c7d362923c2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/all.mk.in
index 7bae0a062b4..66714320b36 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/all.mk.in
index 0e335b5ba95..da57cc37eb9 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/all.mk.in b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/all.mk.in
index 1b448587a73..0df96df93d7 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/all.mk.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_sql/rlm_sql.mk b/src/modules/rlm_sql/rlm_sql.mk
index ec40056d802..e89f36f1018 100644
--- a/src/modules/rlm_sql/rlm_sql.mk
+++ b/src/modules/rlm_sql/rlm_sql.mk
@@ -1,4 +1,4 @@
-TARGET		:= rlm_sql.a
+TARGET		:= rlm_sql$(L)
 SOURCES		:= rlm_sql.c sql.c sql_state.c
 
 SRC_CFLAGS	:= $(rlm_sql_CFLAGS)
diff --git a/src/modules/rlm_sqlcounter/all.mk b/src/modules/rlm_sqlcounter/all.mk
index c0febef3d5b..a952808a4b7 100644
--- a/src/modules/rlm_sqlcounter/all.mk
+++ b/src/modules/rlm_sqlcounter/all.mk
@@ -2,7 +2,7 @@
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_sqlcounter
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 
   # Be sure to NOT include the rlm_sql drivers
   SUBMAKEFILES	:= 
diff --git a/src/modules/rlm_sqlippool/all.mk b/src/modules/rlm_sqlippool/all.mk
index ebb47fa443f..7b1f5f09372 100644
--- a/src/modules/rlm_sqlippool/all.mk
+++ b/src/modules/rlm_sqlippool/all.mk
@@ -2,14 +2,13 @@
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME	:= rlm_sqlippool
-  TARGET	:= $(TARGETNAME).a
+  TARGET	:= $(TARGETNAME)$(L)
 
   # Be sure to NOT include the rlm_sql drivers
-  SUBMAKEFILES	:= 
+  SUBMAKEFILES	:=
 endif
 
 SOURCES		:= $(TARGETNAME).c
 
-SRC_CFLAGS	:= 
-SRC_CFLAGS	+= -I$(top_builddir)/src/modules/rlm_sql
-TGT_LDLIBS	:= 
+SRC_CFLAGS	:= -I$(top_builddir)/src/modules/rlm_sql
+TGT_LDLIBS	:=
diff --git a/src/modules/rlm_stats/all.mk b/src/modules/rlm_stats/all.mk
index 01a1dad45b2..920450ee152 100644
--- a/src/modules/rlm_stats/all.mk
+++ b/src/modules/rlm_stats/all.mk
@@ -1,10 +1,7 @@
 TARGETNAME	:= rlm_stats
 
-ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
-endif
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
 
-SOURCES		:= rlm_stats.c
-
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 LOG_ID_LIB	= 51
diff --git a/src/modules/rlm_test/all.mk b/src/modules/rlm_test/all.mk
index 8611ac4ef19..1d4760540fc 100644
--- a/src/modules/rlm_test/all.mk
+++ b/src/modules/rlm_test/all.mk
@@ -1,4 +1,4 @@
-TARGET		:= rlm_test.a
+TARGET		:= rlm_test$(L)
 SOURCES		:= rlm_test.c
 
 #
diff --git a/src/modules/rlm_totp/all.mk b/src/modules/rlm_totp/all.mk
index a104a13c3e2..660d816c7d0 100644
--- a/src/modules/rlm_totp/all.mk
+++ b/src/modules/rlm_totp/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_totp.a
-SOURCES		:= rlm_totp.c
+TARGETNAME	:= rlm_totp
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 53
diff --git a/src/modules/rlm_unbound/all.mk.in b/src/modules/rlm_unbound/all.mk.in
index 38cba64bad0..58195b3a314 100644
--- a/src/modules/rlm_unbound/all.mk.in
+++ b/src/modules/rlm_unbound/all.mk.in
@@ -2,7 +2,7 @@ TARGETNAME	:= @targetname@
 
 ifneq "$(OPENSSL_LIBS)" ""
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 endif
 
diff --git a/src/modules/rlm_unix/all.mk.in b/src/modules/rlm_unix/all.mk.in
index 66805255c82..9ae8e88931b 100644
--- a/src/modules/rlm_unix/all.mk.in
+++ b/src/modules/rlm_unix/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_unpack/all.mk b/src/modules/rlm_unpack/all.mk
index 90008a6254b..e955e68a609 100644
--- a/src/modules/rlm_unpack/all.mk
+++ b/src/modules/rlm_unpack/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_unpack.a
-SOURCES		:= rlm_unpack.c
+TARGETNAME	:= rlm_unpack
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 56
diff --git a/src/modules/rlm_utf8/all.mk b/src/modules/rlm_utf8/all.mk
index 72e66ff9e53..715267a21a8 100644
--- a/src/modules/rlm_utf8/all.mk
+++ b/src/modules/rlm_utf8/all.mk
@@ -1,3 +1,6 @@
-TARGET		:= rlm_utf8.a
-SOURCES		:= rlm_utf8.c
+TARGETNAME	:= rlm_utf8
+
+TARGET		:= $(TARGETNAME)$(L)
+SOURCES		:= $(TARGETNAME).c
+
 LOG_ID_LIB	= 57
diff --git a/src/modules/rlm_wimax/all.mk b/src/modules/rlm_wimax/all.mk
index 3a08a187895..139d862ddd0 100644
--- a/src/modules/rlm_wimax/all.mk
+++ b/src/modules/rlm_wimax/all.mk
@@ -1,7 +1,7 @@
 TARGETNAME	:= rlm_wimax
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c
diff --git a/src/modules/rlm_winbind/all.mk.in b/src/modules/rlm_winbind/all.mk.in
index c452f4fba18..9aedeb73c02 100644
--- a/src/modules/rlm_winbind/all.mk.in
+++ b/src/modules/rlm_winbind/all.mk.in
@@ -1,7 +1,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c auth_wbclient_pap.c
diff --git a/src/modules/rlm_yubikey/all.mk.in b/src/modules/rlm_yubikey/all.mk.in
index 4c18ba8a029..d9b373e028a 100644
--- a/src/modules/rlm_yubikey/all.mk.in
+++ b/src/modules/rlm_yubikey/all.mk.in
@@ -14,7 +14,7 @@
 TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= $(TARGETNAME).c validate.c decrypt.c
diff --git a/src/process/arp/all.mk b/src/process/arp/all.mk
index 77136fa5cd1..cf8e94fc818 100644
--- a/src/process/arp/all.mk
+++ b/src/process/arp/all.mk
@@ -4,9 +4,9 @@ TARGETNAME := process_arp
 #  ARP depends on pcap.
 #
 ifneq "$(PCAP_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
-TGT_PREREQS	:= libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-arp$(L)
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/process/control/all.mk b/src/process/control/all.mk
index 930e25b72a1..40d189eb30a 100644
--- a/src/process/control/all.mk
+++ b/src/process/control/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= process_control
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/process/dhcpv4/all.mk b/src/process/dhcpv4/all.mk
index 9f75d7e381d..c3f6d70a4e3 100644
--- a/src/process/dhcpv4/all.mk
+++ b/src/process/dhcpv4/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= process_dhcpv4
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a
+TGT_PREREQS	:= libfreeradius-dhcpv4$(L)
diff --git a/src/process/dhcpv6/all.mk b/src/process/dhcpv6/all.mk
index 42699f4cc36..401ca61d20c 100644
--- a/src/process/dhcpv6/all.mk
+++ b/src/process/dhcpv6/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= process_dhcpv6
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv6.a
+TGT_PREREQS	:= libfreeradius-dhcpv6$(L)
diff --git a/src/process/dns/all.mk b/src/process/dns/all.mk
index ec2c9ee63f4..5b7c14f5b60 100644
--- a/src/process/dns/all.mk
+++ b/src/process/dns/all.mk
@@ -1,6 +1,6 @@
 TARGETNAME := process_dns
 
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 
 SOURCES		:= base.c
-TGT_PREREQS	:= libfreeradius-dns.a
+TGT_PREREQS	:= libfreeradius-dns$(L)
diff --git a/src/process/eap_aka/all.mk b/src/process/eap_aka/all.mk
index 303a7efd3fc..8b204effa2f 100644
--- a/src/process/eap_aka/all.mk
+++ b/src/process/eap_aka/all.mk
@@ -1,10 +1,10 @@
 TARGETNAME	:= process_eap_aka
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim$(L)
 
diff --git a/src/process/eap_aka_prime/all.mk b/src/process/eap_aka_prime/all.mk
index eebf9a4ea60..3c7410b45ce 100644
--- a/src/process/eap_aka_prime/all.mk
+++ b/src/process/eap_aka_prime/all.mk
@@ -1,10 +1,10 @@
 TARGETNAME	:= process_eap_aka_prime
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim$(L)
 
diff --git a/src/process/eap_sim/all.mk b/src/process/eap_sim/all.mk
index 11787ed99a0..2478efd1723 100644
--- a/src/process/eap_sim/all.mk
+++ b/src/process/eap_sim/all.mk
@@ -1,10 +1,10 @@
 TARGETNAME	:= process_eap_sim
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim$(L)
 
diff --git a/src/process/radius/all.mk b/src/process/radius/all.mk
index 273dcf735b2..0fb23003603 100644
--- a/src/process/radius/all.mk
+++ b/src/process/radius/all.mk
@@ -1,10 +1,10 @@
 TARGETNAME	:= process_radius
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 
diff --git a/src/process/tacacs/all.mk b/src/process/tacacs/all.mk
index 52ef950e92e..00680536bfb 100644
--- a/src/process/tacacs/all.mk
+++ b/src/process/tacacs/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= process_tacacs
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-tacacs.a
+TGT_PREREQS	:= libfreeradius-tacacs$(L)
diff --git a/src/process/tls/all.mk b/src/process/tls/all.mk
index d6652bde5f5..24b5f884f0a 100644
--- a/src/process/tls/all.mk
+++ b/src/process/tls/all.mk
@@ -1,8 +1,8 @@
 TARGETNAME	:= process_tls
 
 ifneq "$(OPENSSL_LIBS)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
-TGT_PREREQS	:= libfreeradius-tls.a
+TGT_PREREQS	:= libfreeradius-tls$(L)
diff --git a/src/process/ttls/all.mk b/src/process/ttls/all.mk
index 0f2eaba3598..3ee049617b8 100644
--- a/src/process/ttls/all.mk
+++ b/src/process/ttls/all.mk
@@ -1,10 +1,10 @@
 TARGETNAME	:= process_ttls
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius$(L)
 
diff --git a/src/process/vmps/all.mk b/src/process/vmps/all.mk
index a6767862b3a..9bc1d78f15a 100644
--- a/src/process/vmps/all.mk
+++ b/src/process/vmps/all.mk
@@ -1,9 +1,9 @@
 TARGETNAME	:= process_vmps
 
 ifneq "$(TARGETNAME)" ""
-TARGET		:= $(TARGETNAME).a
+TARGET		:= $(TARGETNAME)$(L)
 endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-vmps.a
+TGT_PREREQS	:= libfreeradius-vmps$(L)
diff --git a/src/protocols/arp/all.mk b/src/protocols/arp/all.mk
index ccc37402370..23add242728 100644
--- a/src/protocols/arp/all.mk
+++ b/src/protocols/arp/all.mk
@@ -3,10 +3,10 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-arp.a
+TARGET		:= libfreeradius-arp$(L)
 
 SOURCES		:= base.c
 
 SRC_CFLAGS	:= -D_LIBRADIUS -DNO_ASSERT -I$(top_builddir)/src
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/dhcpv4/all.mk b/src/protocols/dhcpv4/all.mk
index 6972fda7ba2..8d5fcc1d9f6 100644
--- a/src/protocols/dhcpv4/all.mk
+++ b/src/protocols/dhcpv4/all.mk
@@ -3,7 +3,7 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-dhcpv4.a
+TARGET		:= libfreeradius-dhcpv4$(L)
 
 SOURCES		:= base.c \
 		   decode.c \
@@ -16,4 +16,4 @@ SOURCES		:= base.c \
 SRC_CFLAGS	:= -I$(top_builddir)/src -DNO_ASSERT
 TGT_LDLIBS	:= $(PCAP_LIBS)
 TGT_LDFLAGS     := $(PCAP_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/dhcpv4/dhcpv4.h b/src/protocols/dhcpv4/dhcpv4.h
index ed394db206f..123924d734d 100644
--- a/src/protocols/dhcpv4/dhcpv4.h
+++ b/src/protocols/dhcpv4/dhcpv4.h
@@ -116,12 +116,12 @@ typedef struct {
 #ifndef INADDR_BROADCAST
 #  define INADDR_BROADCAST INADDR_NONE
 #endif
+#define ETH_ADDR_LEN   6
 
 #if defined(HAVE_LIBPCAP) || defined(HAVE_LINUX_IF_PACKET_H)
 #  define ETH_TYPE_IP    0x0800
 #  define IP_HDR_SIZE    20
 #  define UDP_HDR_SIZE   8
-#  define ETH_ADDR_LEN   6
 #endif
 
 extern fr_dict_attr_t const		**dhcp_header_attrs[];
diff --git a/src/protocols/dhcpv6/all.mk b/src/protocols/dhcpv6/all.mk
index 79b1ed54bb2..9816fe41ef8 100644
--- a/src/protocols/dhcpv6/all.mk
+++ b/src/protocols/dhcpv6/all.mk
@@ -3,11 +3,11 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-dhcpv6.a
+TARGET		:= libfreeradius-dhcpv6$(L)
 
 SOURCES		:= base.c \
 		   decode.c \
 		   encode.c
 
 SRC_CFLAGS	:= -DNO_ASSERT
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/dns/all.mk b/src/protocols/dns/all.mk
index 7b27565ea14..d2aa0acb190 100644
--- a/src/protocols/dns/all.mk
+++ b/src/protocols/dns/all.mk
@@ -3,11 +3,11 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-dns.a
+TARGET		:= libfreeradius-dns$(L)
 
 SOURCES		:= base.c decode.c encode.c
 
 SRC_CFLAGS	:= -I$(top_builddir)/src -DNO_ASSERT
 TGT_LDLIBS	:= $(PCAP_LIBS)
 TGT_LDFLAGS     := $(PCAP_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/ethernet/all.mk b/src/protocols/ethernet/all.mk
index 1d473559505..7661e858a8d 100644
--- a/src/protocols/ethernet/all.mk
+++ b/src/protocols/ethernet/all.mk
@@ -3,9 +3,9 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-ethernet.a
+TARGET		:= libfreeradius-ethernet$(L)
 
 SOURCES		:= ethernet.c
 
 SRC_CFLAGS	:= -DNO_ASSERT
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
diff --git a/src/protocols/internal/all.mk b/src/protocols/internal/all.mk
index 9b6e302695e..6eb0dbc5db8 100644
--- a/src/protocols/internal/all.mk
+++ b/src/protocols/internal/all.mk
@@ -3,9 +3,9 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-internal.a
+TARGET		:= libfreeradius-internal$(L)
 
 SOURCES		:= decode.c \
 		   encode.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/radius/all.mk b/src/protocols/radius/all.mk
index 600ad3ceb0a..c1586658078 100644
--- a/src/protocols/radius/all.mk
+++ b/src/protocols/radius/all.mk
@@ -3,7 +3,7 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-radius.a
+TARGET		:= libfreeradius-radius$(L)
 
 SOURCES		:= base.c \
 		   decode.c \
@@ -15,4 +15,4 @@ SOURCES		:= base.c \
 
 SRC_CFLAGS	:= -D_LIBRADIUS -DNO_ASSERT -I$(top_builddir)/src
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/tacacs/all.mk b/src/protocols/tacacs/all.mk
index 01718500d00..9488171a3e3 100644
--- a/src/protocols/tacacs/all.mk
+++ b/src/protocols/tacacs/all.mk
@@ -3,7 +3,7 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-tacacs.a
+TARGET		:= libfreeradius-tacacs$(L)
 SOURCES		:= base.c decode.c encode.c
 SRC_CFLAGS	:= -D_LIBRADIUS -DNO_ASSERT -I$(top_builddir)/src
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/protocols/tftp/all.mk b/src/protocols/tftp/all.mk
index c38d739087c..ed0010b5be7 100644
--- a/src/protocols/tftp/all.mk
+++ b/src/protocols/tftp/all.mk
@@ -3,7 +3,7 @@
 #
 # Version:      $Id$
 #
-TARGET      := libfreeradius-tftp.a
+TARGET      := libfreeradius-tftp$(L)
 SOURCES     := base.c encode.c decode.c
 SRC_CFLAGS  := -I$(top_builddir)/src -DNO_ASSERT
-TGT_PREREQS := libfreeradius-util.a
+TGT_PREREQS := libfreeradius-util$(L)
diff --git a/src/protocols/vmps/all.mk b/src/protocols/vmps/all.mk
index 091b4530d24..82baed1acaf 100644
--- a/src/protocols/vmps/all.mk
+++ b/src/protocols/vmps/all.mk
@@ -3,10 +3,10 @@
 #
 # Version:      $Id$
 #
-TARGET		:= libfreeradius-vmps.a
+TARGET		:= libfreeradius-vmps$(L)
 
 SOURCES		:= vmps.c base.c
 
 SRC_CFLAGS	:= -I$(top_builddir)/src -DNO_ASSERT
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
diff --git a/src/tests/digest/all.mk b/src/tests/digest/all.mk
index f90be42ad30..68d0f3bac37 100644
--- a/src/tests/digest/all.mk
+++ b/src/tests/digest/all.mk
@@ -13,7 +13,7 @@ $(eval $(call TEST_BOOTSTRAP))
 #
 #  Ensure that the digest tests are run if the server or rlm_digest module changes
 #
-$(FILES.$(TEST)): $(BUILD_DIR)/lib/rlm_digest.la $(BUILD_DIR)/bin/radiusd $(BUILD_DIR)/bin/radclient
+$(FILES.$(TEST)): $(BUILD_DIR)/lib/rlm_digest.la $(BUILD_DIR)/bin/radiusd$(E) $(BUILD_DIR)/bin/radclient$(E)
 
 #
 #	Config settings
@@ -34,7 +34,7 @@ $(eval $(call RADIUSD_SERVICE,digest,$(OUTPUT)))
 #
 $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 	${Q} [ -f $(dir $@)/radiusd.pid ] || exit 1
-	$(eval TARGET := $(patsubst %.txt,%,$(notdir $@)))
+	$(eval TARGET := $(patsubst %.txt,%,$(notdir $@)$(E)))
 	${Q}for _num in $$(sed '/^#.*TESTS/!d; s/.*TESTS//g' $<); do	\
 		echo "DIGEST-TEST $(TARGET)_$${_num}";			\
 		cp -f $< $@.request;					\
diff --git a/src/tests/radclient/all.mk b/src/tests/radclient/all.mk
index 84799f906b6..75baac580c2 100644
--- a/src/tests/radclient/all.mk
+++ b/src/tests/radclient/all.mk
@@ -33,7 +33,7 @@ $(eval $(call RADIUSD_SERVICE,radiusd,$(OUTPUT)))
 #	Run the radclient commands against the radiusd.
 #
 $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
-	$(eval TARGET   := $(notdir $<))
+	$(eval TARGET   := $(notdir $<)$(E))
 	$(eval TYPE     := $(shell echo $(TARGET) | cut -f1 -d '_'))
 	$(eval CMD_TEST := $(patsubst %.txt,%.cmd,$<))
 	$(eval EXPECTED := $(patsubst %.txt,%.out,$<))
diff --git a/src/tests/radmin/all.mk b/src/tests/radmin/all.mk
index 88abdad2d95..80a4985f5b3 100644
--- a/src/tests/radmin/all.mk
+++ b/src/tests/radmin/all.mk
@@ -57,7 +57,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 	${Q} [ -f $(dir $@)/radiusd.pid ] || exit 1
 	$(eval EXPECTED := $(patsubst %.txt,%.out,$<))
 	$(eval FOUND    := $(patsubst %.txt,%.out,$@))
-	$(eval TARGET   := $(patsubst %.txt,%,$(notdir $@)))
+	$(eval TARGET   := $(patsubst %.txt,%,$(notdir $@)$(E)))
 	${Q}if ! $(TEST_BIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND) 2>&1; then\
 		echo "--------------------------------------------------"; \
 		tail -n 20 "$(RADMIN_RADIUS_LOG)"; \
diff --git a/src/tests/radsniff/all.mk b/src/tests/radsniff/all.mk
index 397c037936c..d1fbb52b625 100644
--- a/src/tests/radsniff/all.mk
+++ b/src/tests/radsniff/all.mk
@@ -40,7 +40,7 @@ $(OUTPUT)/%.pcap: $(DIR)/%.pcap.gz
 #	Run the radsniff commands
 #
 $(OUTPUT)/%.txt: $(DIR)/%.txt $(TEST_BIN_DIR)/radsniff $(PCAP_IN)
-	$(eval TARGET   := $(notdir $@))
+	$(eval TARGET   := $(notdir $@)$(E))
 	$(eval FOUND    := $(patsubst %.txt,%.out,$@))
 	$(eval CMD_TEST := $(patsubst %.txt,%.cmd,$<))
 	$(eval EXPECTED := $<)
diff --git a/src/tests/rbmonkey.mk b/src/tests/rbmonkey.mk
index 71ee633bc9d..53d7024f131 100644
--- a/src/tests/rbmonkey.mk
+++ b/src/tests/rbmonkey.mk
@@ -1,7 +1,7 @@
-TARGET := rbmonkey
+TARGET 		:= rbmonkey$(E)
 
-SOURCES := rbmonkey.c
+SOURCES 	:= rbmonkey.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 TGT_LDLIBS	:= $(LIBS)
 TGT_INSTALLDIR	:=
diff --git a/src/tests/tacacs/all.mk b/src/tests/tacacs/all.mk
index 52340cca38b..447f7c28d6c 100644
--- a/src/tests/tacacs/all.mk
+++ b/src/tests/tacacs/all.mk
@@ -20,7 +20,7 @@ ifeq "$(WITH_TACACS)" "yes"
 #	Test name
 #
 TEST  	   := test.tacacs
-TEST_LIBS  := libfreeradius-tacacs.la proto_tacacs.la proto_tacacs_tcp.la process_tacacs.la
+TEST_LIBS  := libfreeradius-tacacs$(L) proto_tacacs$(L) proto_tacacs_tcp$(L) process_tacacs$(L)
 FILES	   := $(subst $(DIR)/,,$(wildcard $(DIR)/*.txt))
 
 $(eval $(call TEST_BOOTSTRAP))
@@ -47,7 +47,7 @@ $(eval $(call RADIUSD_SERVICE,radiusd,$(OUTPUT)))
 #	Run the tacacs_client commands against the radiusd.
 #
 $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
-	$(eval TARGET   := $(notdir $<))
+	$(eval TARGET   := $(notdir $<))$(E)
 	$(eval CMD_TEST := $(patsubst %.txt,%.cmd,$<))
 	$(eval EXPECTED := $(patsubst %.txt,%.out,$<))
 	$(eval FOUND    := $(patsubst %.txt,%.out,$@))
diff --git a/src/tests/trie/nopc.mk b/src/tests/trie/nopc.mk
index c8b6f7cc186..429baf03afa 100644
--- a/src/tests/trie/nopc.mk
+++ b/src/tests/trie/nopc.mk
@@ -1,9 +1,9 @@
-TARGET		:= nopc
+TARGET		:= nopc$(E)
 
 SRC_CFLAGS	:= -DTESTING -DNO_PATH_COMPRESSION -DDEFAULT_BITS=1
 SOURCES		:= nopc.c
 TGT_LDLIBS	:= $(LIBS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 
 #
 #  The build system maps one source file to one object file.  So in
diff --git a/src/tests/trie/trie.mk b/src/tests/trie/trie.mk
index 6d53a135025..5b80f449c93 100644
--- a/src/tests/trie/trie.mk
+++ b/src/tests/trie/trie.mk
@@ -1,9 +1,9 @@
-TARGET		:= trie
+TARGET		:= trie$(E)
 
 SRC_CFLAGS	:= -DTESTING -DWITH_PATH_COMPRESSION
 SOURCES		:= trie.c
 TGT_LDLIBS	:= $(LIBS)
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util$(L)
 
 #
 #  The build system maps one source file to one object file.  So in
diff --git a/src/tests/util/atomic_queue_test.mk b/src/tests/util/atomic_queue_test.mk
index 1d0523bda10..aed76ad6cc9 100644
--- a/src/tests/util/atomic_queue_test.mk
+++ b/src/tests/util/atomic_queue_test.mk
@@ -1,7 +1,7 @@
-TARGET := atomic_queue_test
+TARGET 		:= atomic_queue_test$(E)
 
 SOURCES		:= atomic_queue_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/channel_test.mk b/src/tests/util/channel_test.mk
index 5db9e1e2ef0..81a95f7ad66 100644
--- a/src/tests/util/channel_test.mk
+++ b/src/tests/util/channel_test.mk
@@ -1,7 +1,7 @@
-TARGET := channel_test
+TARGET 		:= channel_test$(E)
 
 SOURCES		:= channel_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/control_test.mk b/src/tests/util/control_test.mk
index a73a8e91c7f..771c37fec2c 100644
--- a/src/tests/util/control_test.mk
+++ b/src/tests/util/control_test.mk
@@ -1,7 +1,7 @@
-TARGET := control_test
+TARGET 		:= control_test$(E)
 
 SOURCES		:= control_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/message_set_test.mk b/src/tests/util/message_set_test.mk
index 65af86247c4..285c9eba3bd 100644
--- a/src/tests/util/message_set_test.mk
+++ b/src/tests/util/message_set_test.mk
@@ -1,7 +1,7 @@
-TARGET := message_set_test
+TARGET 		:= message_set_test$(E)
 
 SOURCES		:= message_set_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/radius1_test.mk b/src/tests/util/radius1_test.mk
index 0ef5b7e2519..a735932f5fe 100644
--- a/src/tests/util/radius1_test.mk
+++ b/src/tests/util/radius1_test.mk
@@ -1,6 +1,6 @@
-TARGET := radius1_test
+TARGET 		:= radius1_test$(E)
 
 SOURCES		:= radius1_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/tests/util/radius_schedule_test.mk b/src/tests/util/radius_schedule_test.mk
index e71731da3ce..61fb0eccb3e 100644
--- a/src/tests/util/radius_schedule_test.mk
+++ b/src/tests/util/radius_schedule_test.mk
@@ -1,7 +1,7 @@
-TARGET := radius_schedule_test
+TARGET 		:= radius_schedule_test$(E)
 
 SOURCES		:= radius_schedule_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/ring_buffer_test.mk b/src/tests/util/ring_buffer_test.mk
index 58b86b2d251..48a47e95000 100644
--- a/src/tests/util/ring_buffer_test.mk
+++ b/src/tests/util/ring_buffer_test.mk
@@ -1,7 +1,7 @@
-TARGET := ring_buffer_test
+TARGET 		:= ring_buffer_test$(E)
 
 SOURCES		:= ring_buffer_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/schedule_test.mk b/src/tests/util/schedule_test.mk
index 7563bb8339b..7e0ca9e4fde 100644
--- a/src/tests/util/schedule_test.mk
+++ b/src/tests/util/schedule_test.mk
@@ -1,7 +1,7 @@
-TARGET := schedule_test
+TARGET 		:= schedule_test$(E)
 
 SOURCES		:= schedule_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/worker_test.mk b/src/tests/util/worker_test.mk
index 824197248f4..7096ec5cda1 100644
--- a/src/tests/util/worker_test.mk
+++ b/src/tests/util/worker_test.mk
@@ -1,7 +1,7 @@
-TARGET := worker_test
+TARGET 		:= worker_test$(E)
 
 SOURCES		:= worker_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L) libfreeradius-util$(L)
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/vmps/all.mk b/src/tests/vmps/all.mk
index 888cfaa01d5..0101b8c0636 100644
--- a/src/tests/vmps/all.mk
+++ b/src/tests/vmps/all.mk
@@ -28,7 +28,7 @@ $(eval $(call RADIUSD_SERVICE,radiusd,$(OUTPUT)))
 #	Run the VMPS commands against the radiusd.
 #
 $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
-	$(eval TARGET   := $(notdir $<))
+	$(eval TARGET   := $(notdir $<))$(E)
 	$(eval CMD_TEST := $(patsubst %.txt,%.cmd,$<))
 	$(eval EXPECTED := $(patsubst %.txt,%.out,$<))
 	$(eval FOUND    := $(patsubst %.txt,%.out,$@))