From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 17 Oct 2018 17:30:15 +0000 (-0400)
Subject: Revert "simplify linking here, too"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=640d14ea66b79acf5708eefe44ad9587b6046041;p=thirdparty%2Ffreeradius-server.git

Revert "simplify linking here, too"

This reverts commit 5abf2974fd04b62ee2dc94702f0dbab4481c07ae.
---

diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index d72783dd4b6..6cf85904665 100644
--- 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 59ecb231f71..50eef1a7f60 100644
--- 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 8cd790a927d..6a1a6308713 100644
--- 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 112c0d55408..9cd0c2d23e7 100644
--- 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...