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 9ce0f7683f2e864616442b3010d6ea6b54f08c24..0f53d4a8e39e876c1f3a38cfcbfcdb2bee53dc0d 100644 (file)
--- 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 826f56a0a9a6ae6fa344e824f4a0ccbfdef9321d..145f7010e811a59d21f77a5a11d6d711f4f2f2e8 100644 (file)
--- 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 351736ea940ec1be2248e8f261ab22b0ce1eae50..68ba44c74978aeeb76d64464b63ae5fe8377cf7c 100644 (file)
--- 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 380d58f791abaf256b67c6958fddf5b436d7e995..70e289fb109104744c53285581d25dc76ceb5b68 100644 (file)
--- 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 18b8c03ae904e98620aa01b7b9af3071c7b0a2e2..8ca890bb2a208163ae6c3c6e2844df0a960d3918 100644 (file)
--- 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 7c7eb24bb08a7dfa8c11fe0897ec6e9d8ce71bfa..a6af267ee786658438106367b3bf612a6c0d03c4 100644 (file)
--- 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 9fc4becf32a6953c2dc8f2b65fc2ba17ad77a320..5987831dd266def0714f6c654479f349fa6e1d97 100644 (file)
--- 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 3d1df5ecca38286cd7c770c3382d32634d8959a4..812993155f10a266ae15bbabb28cc2c607bdfa55 100644 (file)
--- 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 0583e90096379e0cfe00cd207ea2063e4fc685c1..b9fd38f64f1171d8b83400a51fbcca9cca4f787c 100644 (file)
--- 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)