From 92e840383faa41c28f4ef099ee5fe0b6b18c2738 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Sat, 11 Feb 2017 19:37:04 -0500 Subject: [PATCH] Unbreak test_dbfn make-target doc/dbm.discuss.txt describes how to make and use `test_dbfn` for testing DB functionality. Commit cf0812d5 adds a call to assert_no_variables into store.c which depends upon expand.c functionality and we can't link that in for test_dbfn without pulling in half of Exim. So adjust the test_dbfn target to rebuild store.o in COMPILE_UTILITY mode and link against that variant, then remove the custom-built store.o after the executable has been linked. --- src/OS/Makefile-Base | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 7ba7b0474..f6b42f353 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -779,10 +779,11 @@ sa-os.o: $(HDRS) os.c test_dbfn: config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \ string.o tod.o version.o utf8.o $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c + $(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY store.c $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \ dummies.o sa-globals.o sa-os.o store.o string.o \ tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LDFLAGS) - rm -f dbfn.o + rm -f dbfn.o store.o test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \ store.o string.o tod.o tree.o -- 2.25.1