From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 5 Nov 2017 14:46:11 +0000 (+0000)
Subject: Explicitly link against the RADIUS library
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30a9ed2d1990afdaaac764f77384d3cbaf03533;p=thirdparty%2Ffreeradius-server.git

Explicitly link against the RADIUS library
---

diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index 36564a91bd8..09441cee4a6 100644
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -19,9 +19,3 @@ TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(LIBS) $(LCRYPT) $(SYSTEMD_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS)
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
-
-# 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
-endif
diff --git a/src/modules/rlm_eap/lib/base/all.mk b/src/modules/rlm_eap/lib/base/all.mk
index ebb9ed3ae81..63fbc1e64ee 100644
--- a/src/modules/rlm_eap/lib/base/all.mk
+++ b/src/modules/rlm_eap/lib/base/all.mk
@@ -8,5 +8,6 @@ ifneq (${OPENSSL_LIBS},)
 SOURCES		+= eap_tls.c mppe_keys.c
 endif
 
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a
 SRC_CFLAGS	:= -DEAPLIB
 SRC_INCDIRS	:= . ${top_srcdir}/src/modules/rlm_eap/
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 48521a80148..8867763b687 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
@@ -10,4 +10,4 @@ SRC_CFLAGS	:=
 TGT_LDLIBS	:=
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/ ${top_srcdir}/src/modules/rlm_eap/lib/sim/
 
-TGT_PREREQS	:= libfreeradius-eap.a libfreeradius-eap-sim.a
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-eap-sim.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in
index b75280e6c78..e9b855f69e9 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in
@@ -8,4 +8,4 @@ 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-eap.a
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a
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..b16030ef6e6 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/all.mk
@@ -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-radius.a libfreeradius-util.a libfreeradius-eap.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/all.mk b/src/modules/rlm_eap/types/rlm_eap_leap/all.mk
index 7a0cf800048..baa20aa61bb 100644
--- a/src/modules/rlm_eap/types/rlm_eap_leap/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/all.mk
@@ -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-radius.a libfreeradius-util.a libfreeradius-eap.a
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..d2b0b0f198c 100644
--- a/src/modules/rlm_eap/types/rlm_eap_md5/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/all.mk
@@ -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-radius.a libfreeradius-util.a libfreeradius-eap.a
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..47046f0f098 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/all.mk
@@ -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-radius.a libfreeradius-util.a libfreeradius-eap.a
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 96ae1bd1fe1..b3ab58ebbe1 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
@@ -8,4 +8,4 @@ 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
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk.in b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk.in
index bb21e02135a..cee1749a344 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk.in
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk.in
@@ -13,5 +13,5 @@ TGT_LDLIBS	:= @mod_ldflags@
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a
 
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 f9498a6b136..685a3dfea24 100644
--- a/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
@@ -10,4 +10,4 @@ SRC_CFLAGS	:=
 TGT_LDLIBS	:=
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/ ${top_srcdir}/src/modules/rlm_eap/lib/sim/
 
-TGT_PREREQS	:= libfreeradius-eap.a libfreeradius-eap-sim.a
+TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-eap-sim.a
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..eb3b32fbd25 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
@@ -8,4 +8,4 @@ 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-radius.a libfreeradius-util.a libfreeradius-eap.a
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..bd413806983 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
@@ -8,4 +8,4 @@ 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-radius.a libfreeradius-util.a libfreeradius-eap.a