Explicitly link against the RADIUS library

diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index 36564a91bd8ca5862968187a03bc276328cedbbf..09441cee4a6855c4185773d1fa969e22de343195 100644 (file)
--- 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 ebb9ed3ae818fa8e77998033b5202be378f297e9..63fbc1e64ee993b542e1feeaac47bf87b608e897 100644 (file)
--- 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 48521a8014896d13944a6e23eb9474b1e63d1ee3..8867763b68742d268f2f7b40e1489dd190d272b7 100644 (file)
--- 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 b75280e6c78e5e4e58643a336b81110df8b051f0..e9b855f69e9e9e58dc95149a6e91facad8280902 100644 (file)
--- 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 3731c62b45296eaec4b5725a33fe6bdc077fd104..b16030ef6e6c528aef318877045bec5a8a6c2787 100644 (file)
--- 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 7a0cf80004874749964487ef789036f3c864dd87..baa20aa61bbac046261f5689490d038249a87b32 100644 (file)
--- 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 3172d926f56013f83962bfe25d7fa7c307515135..d2b0b0f198c74f5d25842d3ef038cc5321c33334 100644 (file)
--- 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 5d264cea8f7b6549bb013ead60df961fd0d11919..47046f0f0985fc76000a4070f8b6d46801e92ac3 100644 (file)
--- 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 96ae1bd1fe1405e539636b26c140e74b0d4fa95c..b3ab58ebbe130197b46e65503319f97302eaa050 100644 (file)
--- 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 bb21e02135a643ead138e881fb698f051de51391..cee1749a344ba0083936c602d5a7031026b3790b 100644 (file)
--- 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 f9498a6b136f6256e68f606314c976ce216132bc..685a3dfea245773e88e95f56fcc6d6dc8da54b49 100644 (file)
--- 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 106efa447e2b1807a555a2b8d00078b60788a01e..eb3b32fbd25a0ce3c2136d0024f39a797eaee217 100644 (file)
--- 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 f9b05a6d78c8cbd1d3aef7095ced15ce676676e4..bd413806983eadca9d1142800b384972fcb187f1 100644 (file)
--- 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