From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 14 Jun 2021 21:09:34 +0000 (-0400)
Subject: add back a few more dependencies
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4dcffddcf1e34a666c563a0cdd5a17d11161fac;p=thirdparty%2Ffreeradius-server.git

add back a few more dependencies

thing in src/lib which need libraries from src/protocols should
still manually add libfreeradius-util.la
---

diff --git a/src/lib/eap/all.mk b/src/lib/eap/all.mk
index 9ce0f7683f2..0f53d4a8e39 100644
--- a/src/lib/eap/all.mk
+++ b/src/lib/eap/all.mk
@@ -11,5 +11,5 @@ ifneq (${OPENSSL_LIBS},)
 SOURCES		+= tls.c crypto.c
 endif
 
-TGT_PREREQS	:= libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-util.la libfreeradius-radius.a
 SRC_CFLAGS	:= -DEAPLIB
diff --git a/src/lib/eap_aka_sim/all.mk b/src/lib/eap_aka_sim/all.mk
index 826f56a0a9a..145f7010e81 100644
--- a/src/lib/eap_aka_sim/all.mk
+++ b/src/lib/eap_aka_sim/all.mk
@@ -14,4 +14,4 @@ SOURCES	:= \
 	vector.c \
 	xlat.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a
+TGT_PREREQS	:= libfreeradius-util.la $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a
diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 351736ea940..68ba44c7497 100644
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -14,7 +14,7 @@ SOURCES	:= \
 	schedule.c \
 	worker.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
+TGT_PREREQS	:= libfreeradius-util.la $(LIBFREERADIUS_SERVER)
 TGT_LDLIBS	:= $(LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS)
 
diff --git a/src/lib/server/pair_server_tests.mk b/src/lib/server/pair_server_tests.mk
index 380d58f791a..70e289fb109 100644
--- a/src/lib/server/pair_server_tests.mk
+++ b/src/lib/server/pair_server_tests.mk
@@ -1,7 +1,7 @@
 TARGET      := pair_server_tests
 SOURCES     := pair_server_tests.c
 
-TGT_PREREQS += libfreeradius-radius.a libfreeradius-unlang.a
+TGT_PREREQS += libfreeradius-util.la libfreeradius-radius.a libfreeradius-unlang.a
 
 TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
diff --git a/src/lib/server/trunk_tests.mk b/src/lib/server/trunk_tests.mk
index 18b8c03ae90..8ca890bb2a2 100644
--- a/src/lib/server/trunk_tests.mk
+++ b/src/lib/server/trunk_tests.mk
@@ -9,5 +9,5 @@ ifneq ($(OPENSSL_LIBS),)
 TGT_PREREQS	:= libfreeradius-tls.a
 endif
 
-TGT_PREREQS	+= libfreeradius-unlang.a
+TGT_PREREQS	+= libfreeradius-util.la libfreeradius-unlang.a
 SRC_CFLAGS	+= -DTESTING_TRUNK
diff --git a/src/lib/unlang/all.mk b/src/lib/unlang/all.mk
index 7c7eb24bb08..a6af267ee78 100644
--- a/src/lib/unlang/all.mk
+++ b/src/lib/unlang/all.mk
@@ -29,7 +29,7 @@ SOURCES	:=	base.c \
 
 HEADERS		:= $(subst src/lib/,,$(wildcard src/lib/unlang/*.h))
 
-TGT_PREREQS	+= libfreeradius-server.a
+TGT_PREREQS	+= libfreeradius-util.la libfreeradius-server.a
 
 ifneq ($(MAKECMDGOALS),scan)
 SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
diff --git a/src/lib/util/pair_legacy_tests.mk b/src/lib/util/pair_legacy_tests.mk
index 9fc4becf32a..5987831dd26 100644
--- a/src/lib/util/pair_legacy_tests.mk
+++ b/src/lib/util/pair_legacy_tests.mk
@@ -1,7 +1,7 @@
 TARGET      := pair_legacy_tests
 SOURCES     := pair_legacy_tests.c
 
-TGT_PREREQS := libfreeradius-radius.a
+TGT_PREREQS := libfreeradius-util.la libfreeradius-radius.a
 
 TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
diff --git a/src/lib/util/pair_list_perf_test.mk b/src/lib/util/pair_list_perf_test.mk
index 3d1df5ecca3..812993155f1 100644
--- a/src/lib/util/pair_list_perf_test.mk
+++ b/src/lib/util/pair_list_perf_test.mk
@@ -3,4 +3,4 @@ SOURCES := pair_list_perf_test.c
 
 TGT_INSTALLDIR	:=
 TGT_LDLIBS	:= $(LIBS)
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
+TGT_PREREQS	:= libfreeradius-util.la $(LIBFREERADIUS_SERVER)
diff --git a/src/lib/util/pair_tests.mk b/src/lib/util/pair_tests.mk
index 0583e900963..b9fd38f64f1 100644
--- a/src/lib/util/pair_tests.mk
+++ b/src/lib/util/pair_tests.mk
@@ -1,7 +1,7 @@
 TARGET      := pair_tests
 SOURCES     := pair_tests.c
 
-TGT_PREREQS += libfreeradius-radius.a
+TGT_PREREQS += libfreeradius-util.la libfreeradius-radius.a
 
 TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)