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 bb1970bf6daa1ef97ff36781ab575aaed4551b90..b7be797d7ecfacc697342461275657bc6fd71f2d 100644 (file)
--- 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 70373da5c5c5907589c9a19f51b4b6db4187e79d..5c8a3c7dae8cf7893022dbd0a5190c53f5a0b53e 100644 (file)
--- 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 3988b825e982180bf20512b3bc68e183e929522f..95189568131742247ffcdf7f844ecc02674f7a80 100644 (file)
--- 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 9b3fdc504f05da1483df6b27dd49622e9f044d93..c40a94c90744057a492e4f5be6e957f6bea9332b 100644 (file)
--- 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 ea64507c3efd95f5011b1a66b1aa8118c03edb61..91b4fa8e81da2a70e80ab064b4af102471ca7231 100644 (file)
--- 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 e9ccd0714a2cded6de6622b5ae3be9bc88a30869..5095c202e9da8ff37c0f906b5be54478474a53bb 100644 (file)
--- 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 :=