From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 14 Jun 2021 19:46:56 +0000 (-0400)
Subject: clean up TGT_PREREQS
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15334e6f4f40681fa35c35682ad13aff4434bbc5;p=thirdparty%2Ffreeradius-server.git

clean up TGT_PREREQS

now that we transitive linking, we don't need to specify as many
libraries.
---

diff --git a/src/bin/dhcpclient.mk b/src/bin/dhcpclient.mk
index 6068ce8869b..909407e99df 100644
--- a/src/bin/dhcpclient.mk
+++ b/src/bin/dhcpclient.mk
@@ -1,5 +1,5 @@
 TARGET		:= dhcpclient
 SOURCES		:= dhcpclient.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-dhcpv4.a
+TGT_PREREQS	:= libfreeradius-dhcpv4.a
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/fuzzer.mk b/src/bin/fuzzer.mk
index 23af8d20530..c7a42527c7b 100644
--- a/src/bin/fuzzer.mk
+++ b/src/bin/fuzzer.mk
@@ -20,7 +20,7 @@
 TARGET		:= fuzzer_$(PROTOCOL)
 SOURCES		:= fuzzer.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-$(PROTOCOL).a
+TGT_PREREQS	:= libfreeradius-$(PROTOCOL).a
 
 TGT_LDLIBS	:= $(LIBS) 
 
diff --git a/src/bin/radclient.mk b/src/bin/radclient.mk
index d85da519b5b..0db0a8af07d 100644
--- a/src/bin/radclient.mk
+++ b/src/bin/radclient.mk
@@ -2,7 +2,7 @@ TARGET		:= radclient
 SOURCES		:= radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
 		   ${top_srcdir}/src/modules/rlm_mschap/mschap.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
 
 SRC_CFLAGS	:= -I${top_srcdir}/src/modules/rlm_mschap
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index 6b352a2bd8a..5820be92925 100644
--- a/src/bin/radiusd.mk
+++ b/src/bin/radiusd.mk
@@ -8,7 +8,7 @@ SRC_CFLAGS	:= $(LIBREADLINE_CFLAGS)
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(LIBS) $(SYSTEMD_LIBS) $(LIBREADLINE) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(LIBREADLINE_LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 
 # Flags needed when linking main executables that link against LuaJIT
 ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
diff --git a/src/bin/radsniff.mk b/src/bin/radsniff.mk
index 993bad83b61..2b8601812fd 100644
--- a/src/bin/radsniff.mk
+++ b/src/bin/radsniff.mk
@@ -6,6 +6,6 @@ endif
 
 SOURCES		:= radsniff.c collectd.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
 TGT_LDFLAGS     := $(LDFLAGS) $(PCAP_LDFLAGS) $(COLLECTDC_LDFLAGS)
diff --git a/src/bin/radsnmp.mk b/src/bin/radsnmp.mk
index 873a9f65527..f7715e5bf5f 100644
--- a/src/bin/radsnmp.mk
+++ b/src/bin/radsnmp.mk
@@ -1,6 +1,6 @@
 TARGET		:= radsnmp
 SOURCES		:= radsnmp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
 
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radwho.mk b/src/bin/radwho.mk
index 247e2837c50..de142720c9b 100644
--- a/src/bin/radwho.mk
+++ b/src/bin/radwho.mk
@@ -1,5 +1,5 @@
 TARGET		:= radwho
 SOURCES		:= radwho.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/unit_test_attribute.mk b/src/bin/unit_test_attribute.mk
index 789e782d92c..7202a7e300b 100644
--- a/src/bin/unit_test_attribute.mk
+++ b/src/bin/unit_test_attribute.mk
@@ -1,5 +1,5 @@
 TARGET		:= unit_test_attribute
 SOURCES		:= unit_test_attribute.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/unit_test_map.mk b/src/bin/unit_test_map.mk
index 50eef1a7f60..c9a96cec5ad 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) libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/unit_test_module.mk b/src/bin/unit_test_module.mk
index 79a6283bb58..7cbf3e20b06 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_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 
 # Flags needed when linking main executables that link against LuaJIT
 ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
diff --git a/src/lib/curl/all.mk.in b/src/lib/curl/all.mk.in
index feed07c1f48..e5d1d13ba2c 100644
--- a/src/lib/curl/all.mk.in
+++ b/src/lib/curl/all.mk.in
@@ -13,4 +13,4 @@ SRC_CFLAGS	:= @mod_cflags@
 # the including module also needs to link against libcurl
 TGT_LDLIBS	+= @mod_ldflags@
 
-TGT_PREREQS	+= $(LIBFREERADIUS_SERVER) libfreeradius-util.a
+TGT_PREREQS	+= $(LIBFREERADIUS_SERVER)
diff --git a/src/lib/eap/all.mk b/src/lib/eap/all.mk
index 9f253ba3f6d..9ce0f7683f2 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 libfreeradius-util.a
+TGT_PREREQS	:= 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 757139411b9..826f56a0a9a 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-util.a libfreeradius-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a
diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 56ea3518142..351736ea940 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) libfreeradius-util.la
+TGT_PREREQS	:= $(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 e72d830a131..380d58f791a 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-util.a libfreeradius-radius.a libfreeradius-server.a libfreeradius-unlang.a
+TGT_PREREQS += 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 fde63bb178d..18b8c03ae90 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-util.a libfreeradius-server.a libfreeradius-unlang.a
+TGT_PREREQS	+= libfreeradius-unlang.a
 SRC_CFLAGS	+= -DTESTING_TRUNK
diff --git a/src/lib/unlang/all.mk b/src/lib/unlang/all.mk
index 3b9eaa06d66..7c7eb24bb08 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-util.a libfreeradius-server.a
+TGT_PREREQS	+= 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 2747d2c7d30..9fc4becf32a 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 libfreeradius-util.a
+TGT_PREREQS := 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 29c04767c7f..3d1df5ecca3 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) libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER)
diff --git a/src/lib/util/pair_tests.mk b/src/lib/util/pair_tests.mk
index d7863786448..0583e900963 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 libfreeradius-util.a
+TGT_PREREQS += libfreeradius-radius.a
 
 TGT_LDLIBS  := $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
diff --git a/src/listen/arp/proto_arp.mk b/src/listen/arp/proto_arp.mk
index 2d2fa6b728b..091bdd49bee 100644
--- a/src/listen/arp/proto_arp.mk
+++ b/src/listen/arp/proto_arp.mk
@@ -8,5 +8,5 @@ TARGET		:= $(TARGETNAME).a
 endif
 
 SOURCES		:= proto_arp.c
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-arp.a
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/listen/control/proto_control.mk b/src/listen/control/proto_control.mk
index cb4f3a0411c..3499638644d 100644
--- a/src/listen/control/proto_control.mk
+++ b/src/listen/control/proto_control.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_control.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-io.a
diff --git a/src/listen/control/proto_control_unix.mk b/src/listen/control/proto_control_unix.mk
index 3e6e2ae42a6..4c5e530e9c3 100644
--- a/src/listen/control/proto_control_unix.mk
+++ b/src/listen/control/proto_control_unix.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_control_unix.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-control.a
+TGT_PREREQS	:= libfreeradius-control.a
diff --git a/src/listen/control/radmin.mk b/src/listen/control/radmin.mk
index 4f0b49148d8..330917e7ab3 100644
--- a/src/listen/control/radmin.mk
+++ b/src/listen/control/radmin.mk
@@ -9,6 +9,6 @@ SOURCES		:= radmin.c
 SRC_CFLAGS	:= $(LIBREADLINE_CFLAGS)
 
 TGT_INSTALLDIR  := ${sbindir}
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-control.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-control.a
 TGT_LDLIBS	:= $(LIBS) $(LIBREADLINE)
 TGT_LDFLAGS	:= $(LDFLAGS) $(LIBREADLINE_LDFLAGS)
diff --git a/src/listen/detail/proto_detail.mk b/src/listen/detail/proto_detail.mk
index 27102b37a5a..c161ae84345 100644
--- a/src/listen/detail/proto_detail.mk
+++ b/src/listen/detail/proto_detail.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_detail.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
diff --git a/src/listen/dhcpv4/proto_dhcpv4.mk b/src/listen/dhcpv4/proto_dhcpv4.mk
index 5e58190f49a..11d7cb34834 100644
--- a/src/listen/dhcpv4/proto_dhcpv4.mk
+++ b/src/listen/dhcpv4/proto_dhcpv4.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_dhcpv4.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-util.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-io.a
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.mk b/src/listen/dhcpv4/proto_dhcpv4_udp.mk
index deeaaa413c0..9227273df8c 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.mk
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_dhcpv4_udp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-dhcpv4.a libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-arp.a
diff --git a/src/listen/dhcpv6/proto_dhcpv6.mk b/src/listen/dhcpv6/proto_dhcpv6.mk
index b41835e93c7..8eddf3fdff0 100644
--- a/src/listen/dhcpv6/proto_dhcpv6.mk
+++ b/src/listen/dhcpv6/proto_dhcpv6.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_dhcpv6.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv6.a libfreeradius-util.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-dhcpv6.a libfreeradius-io.a
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.mk b/src/listen/dhcpv6/proto_dhcpv6_udp.mk
index 1b08838b2f3..3bf88b7d410 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.mk
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_dhcpv6_udp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-dhcpv6.a
+TGT_PREREQS	:= libfreeradius-dhcpv6.a
diff --git a/src/listen/radius/proto_radius.mk b/src/listen/radius/proto_radius.mk
index 5c1f3de0672..190580b7eb9 100644
--- a/src/listen/radius/proto_radius.mk
+++ b/src/listen/radius/proto_radius.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_radius.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-io.a
diff --git a/src/listen/radius/proto_radius_load.mk b/src/listen/radius/proto_radius_load.mk
index 45a8997bbc9..6f642dac7d2 100644
--- a/src/listen/radius/proto_radius_load.mk
+++ b/src/listen/radius/proto_radius_load.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_radius_load.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/listen/radius/proto_radius_tcp.mk b/src/listen/radius/proto_radius_tcp.mk
index b36022badca..e092b0b15cb 100644
--- a/src/listen/radius/proto_radius_tcp.mk
+++ b/src/listen/radius/proto_radius_tcp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_radius_tcp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/listen/radius/proto_radius_udp.mk b/src/listen/radius/proto_radius_udp.mk
index 7c9f315820e..b772bc3e643 100644
--- a/src/listen/radius/proto_radius_udp.mk
+++ b/src/listen/radius/proto_radius_udp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_radius_udp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/listen/tacacs/proto_tacacs.mk b/src/listen/tacacs/proto_tacacs.mk
index 55b97db8801..624a451e2ba 100644
--- a/src/listen/tacacs/proto_tacacs.mk
+++ b/src/listen/tacacs/proto_tacacs.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_tacacs.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-tacacs.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-tacacs.a libfreeradius-io.a
diff --git a/src/listen/tacacs/proto_tacacs_tcp.mk b/src/listen/tacacs/proto_tacacs_tcp.mk
index 6df62bea803..794a518bd41 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.mk
+++ b/src/listen/tacacs/proto_tacacs_tcp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_tacacs_tcp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-tacacs.a
+TGT_PREREQS	:= libfreeradius-tacacs.a
diff --git a/src/listen/vmps/proto_vmps.mk b/src/listen/vmps/proto_vmps.mk
index 51858ab9176..a93f3397990 100644
--- a/src/listen/vmps/proto_vmps.mk
+++ b/src/listen/vmps/proto_vmps.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_vmps.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-radius.a libfreeradius-vmps.a libfreeradius-io.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-vmps.a libfreeradius-io.a
diff --git a/src/listen/vmps/proto_vmps_udp.mk b/src/listen/vmps/proto_vmps_udp.mk
index 14b1dd3f0d6..e3182d1c60c 100644
--- a/src/listen/vmps/proto_vmps_udp.mk
+++ b/src/listen/vmps/proto_vmps_udp.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_vmps_udp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-vmps.a
+TGT_PREREQS	:= libfreeradius-vmps.a
diff --git a/src/modules/rlm_chap/all.mk b/src/modules/rlm_chap/all.mk
index 2b52cd8dc49..3ac34b018ea 100644
--- a/src/modules/rlm_chap/all.mk
+++ b/src/modules/rlm_chap/all.mk
@@ -1,4 +1,4 @@
 TARGET		:= rlm_chap.a
 SOURCES		:= rlm_chap.c
 
-TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/modules/rlm_dhcpv4/all.mk b/src/modules/rlm_dhcpv4/all.mk
index 598259c99d6..f5c529880ff 100644
--- a/src/modules/rlm_dhcpv4/all.mk
+++ b/src/modules/rlm_dhcpv4/all.mk
@@ -1,4 +1,4 @@
 TARGET		:= rlm_dhcpv4.a
 SOURCES		:= rlm_dhcpv4.c
 
-TGT_PREREQS	:= libfreeradius-dhcpv4.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-dhcpv4.a
diff --git a/src/modules/rlm_eap/rlm_eap.mk b/src/modules/rlm_eap/rlm_eap.mk
index 4f80ef7c06b..c5883f0f709 100644
--- a/src/modules/rlm_eap/rlm_eap.mk
+++ b/src/modules/rlm_eap/rlm_eap.mk
@@ -3,4 +3,4 @@ SOURCES		:= rlm_eap.c
 
 SRC_INCDIRS	:= . lib/base
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap.a
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 72524c0cf26..24256532025 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk b/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
index c9d92f3bdce..72a003a3611 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_aka_prime/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
index beeb26cf264..ae1d0e63996 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk
@@ -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-radius.a libfreeradius-util.a libfreeradius-tls.a libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-tls.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 b16030ef6e6..3731c62b452 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= 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 d2b0b0f198c..3172d926f56 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= 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 47046f0f098..5d264cea8f7 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= 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 91dcbc1419c..a38dae0e470 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-soh.a
+TGT_PREREQS	:= libfreeradius-eap.a libfreeradius-soh.a
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
index ce1a46fc2cb..9a21e1f8b48 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/all.mk
@@ -8,4 +8,4 @@ SOURCES		:= $(TARGETNAME).c eap_pwd.c
 
 SRC_INCDIRS	:= ${top_srcdir}/src/modules/rlm_eap/ ${top_srcdir}/src/modules/rlm_eap/lib/base/
 
-TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= 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 1fb9cead506..5ae54713e1c 100644
--- a/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= $(TARGETNAME).c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-radius.a libfreeradius-util.a libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-eap.a libfreeradius-sim.a libfreeradius-eap-aka-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 eb3b32fbd25..106efa447e2 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= 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 bd413806983..f9b05a6d78c 100644
--- 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-radius.a libfreeradius-util.a libfreeradius-eap.a
+TGT_PREREQS	:= libfreeradius-eap.a
diff --git a/src/modules/rlm_radius/rlm_radius.mk b/src/modules/rlm_radius/rlm_radius.mk
index 7ba623f7e27..ba169ef22cf 100644
--- a/src/modules/rlm_radius/rlm_radius.mk
+++ b/src/modules/rlm_radius/rlm_radius.mk
@@ -2,4 +2,4 @@ TARGET		:= rlm_radius.a
 
 SOURCES		:= rlm_radius.c
 
-TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/modules/rlm_radius/rlm_radius_udp.mk b/src/modules/rlm_radius/rlm_radius_udp.mk
index 60c7da40530..0c9a987ea00 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.mk
+++ b/src/modules/rlm_radius/rlm_radius_udp.mk
@@ -2,4 +2,4 @@ TARGET		:= rlm_radius_udp.a
 
 SOURCES		:= rlm_radius_udp.c track.c
 
-TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
index 7981177ab42..8474d192f9e 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.mk
@@ -12,7 +12,7 @@ endif
 SOURCES		:= $(TARGETNAME).c
 SRC_CFLAGS	+= -I$(top_builddir)/src/lib/redis
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-redis.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-redis.a
 TGT_LDLIBS	+= $(TALLOC_LIBS) $(OPENSSL_LIBS)
 
 MAN		:= rlm_redis_ippool_tool.8
diff --git a/src/modules/rlm_stats/all.mk b/src/modules/rlm_stats/all.mk
index c7e6ee5f841..df8204b04f7 100644
--- a/src/modules/rlm_stats/all.mk
+++ b/src/modules/rlm_stats/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= rlm_stats.c
 
-TGT_PREREQS	:= libfreeradius-radius.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-radius.a
diff --git a/src/process/arp/all.mk b/src/process/arp/all.mk
index af907322c7d..77136fa5cd1 100644
--- a/src/process/arp/all.mk
+++ b/src/process/arp/all.mk
@@ -8,5 +8,5 @@ TARGET		:= $(TARGETNAME).a
 endif
 
 SOURCES		:= base.c
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-arp.a
+TGT_PREREQS	:= libfreeradius-arp.a
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/process/dhcpv4/all.mk b/src/process/dhcpv4/all.mk
index d1624e853bc..9f75d7e381d 100644
--- a/src/process/dhcpv4/all.mk
+++ b/src/process/dhcpv4/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-dhcpv4.a
+TGT_PREREQS	:= libfreeradius-dhcpv4.a
diff --git a/src/process/dhcpv6/all.mk b/src/process/dhcpv6/all.mk
index 239d7da111a..42699f4cc36 100644
--- a/src/process/dhcpv6/all.mk
+++ b/src/process/dhcpv6/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-dhcpv6.a
+TGT_PREREQS	:= libfreeradius-dhcpv6.a
diff --git a/src/process/eap_aka/all.mk b/src/process/eap_aka/all.mk
index efed1c1af5e..303a7efd3fc 100644
--- a/src/process/eap_aka/all.mk
+++ b/src/process/eap_aka/all.mk
@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
 
diff --git a/src/process/eap_aka_prime/all.mk b/src/process/eap_aka_prime/all.mk
index 08b8bd7be4a..eebf9a4ea60 100644
--- a/src/process/eap_aka_prime/all.mk
+++ b/src/process/eap_aka_prime/all.mk
@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
 
diff --git a/src/process/eap_sim/all.mk b/src/process/eap_sim/all.mk
index eac5be85c66..11787ed99a0 100644
--- a/src/process/eap_sim/all.mk
+++ b/src/process/eap_sim/all.mk
@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-eap-aka-sim.a
+TGT_PREREQS	:= libfreeradius-eap-aka-sim.a
 
diff --git a/src/process/radius/all.mk b/src/process/radius/all.mk
index 78536fbde1b..273dcf735b2 100644
--- a/src/process/radius/all.mk
+++ b/src/process/radius/all.mk
@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
+TGT_PREREQS	:= libfreeradius-radius.a
 
diff --git a/src/process/tacacs/all.mk b/src/process/tacacs/all.mk
index e1012db36cf..52ef950e92e 100644
--- a/src/process/tacacs/all.mk
+++ b/src/process/tacacs/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-tacacs.a
+TGT_PREREQS	:= libfreeradius-tacacs.a
diff --git a/src/process/tls/all.mk b/src/process/tls/all.mk
index 34727d399de..77a614e52a9 100644
--- a/src/process/tls/all.mk
+++ b/src/process/tls/all.mk
@@ -1,5 +1,5 @@
 TARGETNAME := process_tls
 
 SOURCES		:= base.c
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-tls.a
+TGT_PREREQS	:= libfreeradius-tls.a
 TGT_LDLIBS	:= $(PCAP_LIBS)
diff --git a/src/process/vmps/all.mk b/src/process/vmps/all.mk
index a40d3fa4ac7..a6767862b3a 100644
--- a/src/process/vmps/all.mk
+++ b/src/process/vmps/all.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= base.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-vmps.a
+TGT_PREREQS	:= libfreeradius-vmps.a
diff --git a/src/protocols/ethernet/all.mk b/src/protocols/ethernet/all.mk
index 7dabbdb852d..1d473559505 100644
--- a/src/protocols/ethernet/all.mk
+++ b/src/protocols/ethernet/all.mk
@@ -8,4 +8,4 @@ TARGET		:= libfreeradius-ethernet.a
 SOURCES		:= ethernet.c
 
 SRC_CFLAGS	:= -DNO_ASSERT
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
diff --git a/src/tests/util/atomic_queue_test.mk b/src/tests/util/atomic_queue_test.mk
index 58f2d4ad4e4..1d0523bda10 100644
--- a/src/tests/util/atomic_queue_test.mk
+++ b/src/tests/util/atomic_queue_test.mk
@@ -2,6 +2,6 @@ TARGET := atomic_queue_test
 
 SOURCES		:= atomic_queue_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/channel_test.mk b/src/tests/util/channel_test.mk
index 898c982de8a..5db9e1e2ef0 100644
--- a/src/tests/util/channel_test.mk
+++ b/src/tests/util/channel_test.mk
@@ -2,6 +2,6 @@ TARGET := channel_test
 
 SOURCES		:= channel_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/control_test.mk b/src/tests/util/control_test.mk
index 8b07ca237fe..a73a8e91c7f 100644
--- a/src/tests/util/control_test.mk
+++ b/src/tests/util/control_test.mk
@@ -2,6 +2,6 @@ TARGET := control_test
 
 SOURCES		:= control_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/message_set_test.mk b/src/tests/util/message_set_test.mk
index c07397cfe94..65af86247c4 100644
--- a/src/tests/util/message_set_test.mk
+++ b/src/tests/util/message_set_test.mk
@@ -2,6 +2,6 @@ TARGET := message_set_test
 
 SOURCES		:= message_set_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/radius1_test.mk b/src/tests/util/radius1_test.mk
index b9771abfbe9..0ef5b7e2519 100644
--- a/src/tests/util/radius1_test.mk
+++ b/src/tests/util/radius1_test.mk
@@ -2,5 +2,5 @@ TARGET := radius1_test
 
 SOURCES		:= radius1_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/tests/util/radius_schedule_test.mk b/src/tests/util/radius_schedule_test.mk
index bb5f65806c9..e71731da3ce 100644
--- a/src/tests/util/radius_schedule_test.mk
+++ b/src/tests/util/radius_schedule_test.mk
@@ -2,6 +2,6 @@ TARGET := radius_schedule_test
 
 SOURCES		:= radius_schedule_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/ring_buffer_test.mk b/src/tests/util/ring_buffer_test.mk
index 4d64355d430..58b86b2d251 100644
--- a/src/tests/util/ring_buffer_test.mk
+++ b/src/tests/util/ring_buffer_test.mk
@@ -2,6 +2,6 @@ TARGET := ring_buffer_test
 
 SOURCES		:= ring_buffer_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)
 
diff --git a/src/tests/util/schedule_test.mk b/src/tests/util/schedule_test.mk
index 773ed0118ad..7563bb8339b 100644
--- a/src/tests/util/schedule_test.mk
+++ b/src/tests/util/schedule_test.mk
@@ -2,6 +2,6 @@ TARGET := schedule_test
 
 SOURCES		:= schedule_test.c
 
-TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a
+TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)