Revert "simplify linking here, too"

This reverts commit 5abf2974fd04b62ee2dc94702f0dbab4481c07ae.

diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index d72783dd4b64c8a77fdde4897eef54ade083610e..6cf85904665fb9767111b5cbb1315422a758c285 100644 (file)
--- a/src/bin/radiusd.mk
+++ b/src/bin/radiusd.mk
@@ -8,4 +8,4 @@ SRC_CFLAGS      := $(LIBREADLINE_CFLAGS)
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS     := $(LIBS) $(SYSTEMD_LIBS) $(LIBREADLINE)
 TGT_LDFLAGS    := $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(LIBREADLINE_LDFLAGS)
-TGT_PREREQS    := libfreeradius-unlang.a libfreeradius-io.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a

diff --git a/src/bin/unit_test_map.mk b/src/bin/unit_test_map.mk
index 59ecb231f71234f4f0e645c22feb241191c7d787..50eef1a7f6086e6c24d771e0f6d67ff9bfd80d49 100644 (file)
--- a/src/bin/unit_test_map.mk
+++ b/src/bin/unit_test_map.mk
@@ -1,5 +1,5 @@
 TARGET         := unit_test_map
 SOURCES                := unit_test_map.c
 
-TGT_PREREQS    := libfreeradius-server.a libfreeradius-unlang.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-util.a
 TGT_LDLIBS     := $(LIBS)

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 8cd790a927da31c14c681417fdcf4aa9384ec5d3..6a1a63087130057509d8e6694462d6af4844bc88 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/state.h>
+
 #include <freeradius-devel/radius/defs.h>
 #include <freeradius-devel/radius/radius.h>
 

diff --git a/src/bin/unit_test_module.mk b/src/bin/unit_test_module.mk
index 112c0d55408a7c07dc6db95362e3d0722be98c40..9cd0c2d23e7909f3b48066655e01d667327df16e 100644 (file)
--- a/src/bin/unit_test_module.mk
+++ b/src/bin/unit_test_module.mk
@@ -3,7 +3,7 @@ SOURCES := unit_test_module.c
 
 TGT_INSTALLDIR  :=
 TGT_LDLIBS     := $(LIBS) $(LCRYPT)
-TGT_PREREQS    := libfreeradius-io.a libfreeradius-radius.a libfreeradius-unlang.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-io.a libfreeradius-util.a
 
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...