From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 10 May 2026 17:58:07 +0000 (-0400)
Subject: sort the libraries for consistent build order
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dc7ccc34cc83d2dfde10cbd5359e6e5e76e899a;p=thirdparty%2Ffreeradius-server.git

sort the libraries for consistent build order

and use $(LIBFREERADIUS_SERVER) instead of manual linkages,
which lets us build with / without TLS much more easily
---

diff --git a/src/lib/all.mk b/src/lib/all.mk
index bb1970bf6da..b7be797d7ec 100644
--- a/src/lib/all.mk
+++ b/src/lib/all.mk
@@ -41,7 +41,7 @@ endef
 #  And then get the rest by wildcard, and ensure unsure that they're
 #  all unique.
 #
-SUBMAKEFILES := $(strip $(call uniq,$(patsubst %,${top_srcdir}/src/lib/%/all.mk,util tls eap eap_aka_sim server unlang io) $(wildcard ${top_srcdir}/src/lib/*/all.mk)))
+SUBMAKEFILES := $(sort $(strip $(call uniq,$(patsubst %,${top_srcdir}/src/lib/%/all.mk,util tls eap eap_aka_sim server unlang io) $(wildcard ${top_srcdir}/src/lib/*/all.mk))))
 
 #
 #  Add library-specific rules to link include files, etc.
diff --git a/src/lib/server/cf_tests.mk b/src/lib/server/cf_tests.mk
index 70373da5c5c..5c8a3c7dae8 100644
--- a/src/lib/server/cf_tests.mk
+++ b/src/lib/server/cf_tests.mk
@@ -3,6 +3,6 @@ SOURCES		:= cf_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
+TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
 
 TGT_INSTALLDIR	:=
diff --git a/src/lib/server/pair_server_tests.mk b/src/lib/server/pair_server_tests.mk
index 3988b825e98..95189568131 100644
--- a/src/lib/server/pair_server_tests.mk
+++ b/src/lib/server/pair_server_tests.mk
@@ -3,6 +3,6 @@ SOURCES     	:= pair_server_tests.c
 
 TGT_LDLIBS  	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS 	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS 	:= libfreeradius-util$(L) libfreeradius-radius$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
+TGT_PREREQS 	:= libfreeradius-util$(L) libfreeradius-radius$(L) $(LIBFREERADIUS_SERVER)
 
 TGT_INSTALLDIR	:=
diff --git a/src/lib/server/tmpl_dcursor_tests.mk b/src/lib/server/tmpl_dcursor_tests.mk
index 9b3fdc504f0..c40a94c9074 100644
--- a/src/lib/server/tmpl_dcursor_tests.mk
+++ b/src/lib/server/tmpl_dcursor_tests.mk
@@ -3,6 +3,6 @@ SOURCES		:= tmpl_dcursor_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
+TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
 
 TGT_INSTALLDIR	:=
diff --git a/src/lib/server/tmpl_tests.mk b/src/lib/server/tmpl_tests.mk
index ea64507c3ef..91b4fa8e81d 100644
--- a/src/lib/server/tmpl_tests.mk
+++ b/src/lib/server/tmpl_tests.mk
@@ -3,6 +3,6 @@ SOURCES		:= tmpl_tests.c
 
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
+TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
 
 TGT_INSTALLDIR	:=
diff --git a/src/lib/server/trunk_tests.mk b/src/lib/server/trunk_tests.mk
index e9ccd0714a2..5095c202e9d 100644
--- a/src/lib/server/trunk_tests.mk
+++ b/src/lib/server/trunk_tests.mk
@@ -4,11 +4,7 @@ SOURCES		:= trunk_tests.c
 TGT_LDLIBS	:= $(LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(GPERFTOOLS_LDFLAGS)
 
-ifneq ($(OPENSSL_LIBS),)
-TGT_PREREQS	:= libfreeradius-tls$(L)
-endif
-
-TGT_PREREQS	+= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-unlang$(L)
+TGT_PREREQS	+= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
 SRC_CFLAGS	+= -DTESTING_TRUNK
 
 TGT_INSTALLDIR	:=