From: Phil Pennock <pdp@exim.org>
Date: Sun, 12 Feb 2017 00:37:04 +0000 (-0500)
Subject: Unbreak test_dbfn make-target
X-Git-Tag: exim-4_89_RC4~1
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/c74a319dd3fbc47e0ad2adbde69f3a9ad0e7c5cd

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.

(cherry picked from commit 92e840383faa41c28f4ef099ee5fe0b6b18c2738)
Signed-off-by: Phil Pennock <pdp@exim.org>
---

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