Revert "simplify linking here, too"

This reverts commit 5abf297.
FreeRADIUS · Oct 17, 2018 · 640d14e · 640d14e
1 parent 5abf297
commit 640d14e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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...