X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1145b1aea70658de9f7f85b03772bc06408c027a..e00836bed8c0d272137531616cadcae68416fa18:/src/OS/Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index afa2a7a23..f494249bf 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -250,8 +250,7 @@ macro.c: macro_predef
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
-        transport-filter.pl convert4r3 convert4r4 \
-        exim_checkaccess \
+        transport-filter.pl exim_checkaccess \
         exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
 	exim_lock exim_msgdate exim_id_update
 
@@ -490,30 +489,6 @@ transport-filter.pl: config ../src/transport-filter.src
 	@chmod a+x transport-filter.pl
 	@echo ">>> transport-filter.pl script built"
 
-convert4r3: config ../src/convert4r3.src
-	@rm -f convert4r3
-	@. ./version.sh && sed \
-	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-	  ../src/convert4r3.src > convert4r3-t
-	@mv convert4r3-t convert4r3
-	@chmod a+x convert4r3
-	@./convert4r3 -v 2>&1 >/dev/null
-	@echo ">>> convert4r3 script built"
-
-convert4r4: config ../src/convert4r4.src
-	@rm -f convert4r4
-	@. ./version.sh && sed \
-	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-	  ../src/convert4r4.src > convert4r4-t
-	@mv convert4r4-t convert4r4
-	@chmod a+x convert4r4
-	@./convert4r4 -v 2>&1 >/dev/null
-	@echo ">>> convert4r4 script built"
-
 
 # These are objects of optional features. They are always compiled, but
 # if the corresponding #defines are not set, they wind up empty and
@@ -543,7 +518,7 @@ OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o regex_cache.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
-        environment.o macro.o \
+        xtextencode.o environment.o macro.o \
         $(OBJ_LOOKUPS) \
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_EXPERIMENTAL)
@@ -569,7 +544,7 @@ exim:   buildlookups buildauths pdkim/pdkim.a \
 
 # The utility for dumping the contents of an exim database
 
-OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o
+OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o util-xtextencode.o
 
 exim_dumpdb: $(OBJ_DUMPDB)
 	@echo "$(LNCC) -o exim_dumpdb"
@@ -584,7 +559,7 @@ exim_dumpdb: $(OBJ_DUMPDB)
 
 # The utility for interrogating/fixing the contents of an exim database
 
-OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o
+OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o util-xtextencode.o
 
 exim_fixdb:  $(OBJ_FIXDB)
 	@echo "$(LNCC) -o exim_fixdb"
@@ -599,11 +574,12 @@ exim_fixdb:  $(OBJ_FIXDB)
 
 # The utility for tidying the contents of an exim database
 
-OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o
+OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o util-xtextencode.o
 
 exim_tidydb: $(OBJ_TIDYDB)
 	@echo "$(LNCC) -o exim_tidydb"
-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
+	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) \
+	  $(OBJ_TIDYDB) \
 	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_tidydb; \
@@ -614,9 +590,12 @@ exim_tidydb: $(OBJ_TIDYDB)
 
 # The utility for building dbm files
 
-exim_dbmbuild: exim_dbmbuild.o
+OBJ_DBMBUILD = exim_dbmbuild.o util-xtextencode.o
+
+exim_dbmbuild: $(OBJ_DBMBUILD)
 	@echo "$(LNCC) -o exim_dbmbuild"
-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \
+	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) \
+	  $(OBJ_DBMBUILD) \
 	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_dbmbuild; \
@@ -661,6 +640,7 @@ OBJ_MONBIN = util-host_address.o \
 	     util-string.o \
 	     util-tod.o \
 	     util-tree.o \
+	     util-xtextencode.o \
 	     $(MONBIN)
 
 eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \
@@ -695,6 +675,11 @@ HDRS  =	blob.h \
 	hash.h \
 	hintsdb.h \
 	hintsdb_structs.h \
+	hintsdb/hints_bdb.h \
+	hintsdb/hints_gdbm.h \
+	hintsdb/hints_ndbm.h \
+	hintsdb/hints_sqlite.h \
+	hintsdb/hints_tdb.h \
 	local_scan.h \
 	macros.h \
 	mytypes.h \
@@ -709,6 +694,11 @@ PHDRS = ../config.h \
 	../globals.h \
 	../hintsdb.h \
 	../hintsdb_structs.h \
+	../hintsdb/hints_bdb.h \
+	../hintsdb/hints_gdbm.h \
+	../hintsdb/hints_ndbm.h \
+	../hintsdb/hints_sqlite.h \
+	../hintsdb/hints_tdb.h \
 	../local_scan.h \
 	../macros.h \
 	../mytypes.h \
@@ -809,6 +799,10 @@ util-tree.o:   $(HDRS) tree.c
 	@echo "$(CC) -DCOMPILE_UTILITY tree.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tree.o tree.c
 
+util-xtextencode.o:   $(HDRS) xtextencode.c
+	@echo "$(CC) -DCOMPILE_UTILITY xtextencode.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-xtextencode.o xtextencode.c
+
 util-os.o:       $(HDRS) os.c
 	@echo "$(CC) -DCOMPILE_UTILITY os.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) \
@@ -884,6 +878,7 @@ tod.o:           $(HDRS) tod.c
 transport.o:     $(HDRS) transport.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c
+xtextencode.o:   $(HDRS) xtextencode.c
 dkim.o:          $(HDRS) pdkim/pdkim.h dkim.c
 dkim_transport.o: $(HDRS) dkim_transport.c