Build: tidying

8 files changed, 29 insertions, 99 deletions

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 60c97c210..26f06eca6 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -123,109 +123,39 @@ config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME)
 
 # Build the builtin-macros data struct
 
-MACRO_HSRC = macro_predef.h os.h globals.h config.h \
+MACRO_HSRC = predef.h os.h globals.h config.h \
 	routers/accept.h routers/dnslookup.h routers/ipliteral.h \
 	routers/iplookup.h routers/manualroute.h routers/queryprogram.h \
 	routers/redirect.h
 
-OBJ_MACRO = macro_predef.o \
+OBJ_MACRO_PLAIN = macro-predef.o \
 	macro-globals.o macro-readconf.o macro-route.o macro-transport.o macro-drtables.o \
+	macro-dkim.o
+OBJ_MACRO_TP = \
 	macro-appendfile.o macro-autoreply.o macro-lmtp.o macro-pipe.o macro-queuefile.o \
-	macro-smtp.o macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \
-	macro-manualroute.o macro-queryprogram.o macro-redirect.o \
+	macro-smtp.o
+OBJ_MACRO_RT = \
+	macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \
+	macro-manualroute.o macro-queryprogram.o macro-redirect.o
+OBJ_MACRO_AU = \
 	macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \
-	macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-tls.o\
-	macro-dkim.o
+	macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-tls.o
 
+OBJ_MACRO = $(OBJ_MACRO_PLAIN) $(OBJ_MACRO_TP) $(OBJ_MACRO_RT) $(OBJ_MACRO_AU)
 $(OBJ_MACRO):	$(MACRO_HSRC)
 
-macro_predef.o :	macro_predef.c
-	@echo "$(CC) -DMACRO_PREDEF macro_predef.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ macro_predef.c
-macro-globals.o :	globals.c
-	@echo "$(CC) -DMACRO_PREDEF globals.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ globals.c
-macro-readconf.o :	readconf.c
-	@echo "$(CC) -DMACRO_PREDEF readconf.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ readconf.c
-macro-route.o :		route.c
-	@echo "$(CC) -DMACRO_PREDEF route.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ route.c
-macro-transport.o:	transport.c
-	@echo "$(CC) -DMACRO_PREDEF transport.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transport.c
-macro-drtables.o :	drtables.c
-	@echo "$(CC) -DMACRO_PREDEF drtables.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ drtables.c
-macro-appendfile.o :	transports/appendfile.c
-	@echo "$(CC) -DMACRO_PREDEF transports/appendfile.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/appendfile.c
-macro-autoreply.o :	transports/autoreply.c
-	@echo "$(CC) -DMACRO_PREDEF transports/autoreply.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/autoreply.c
-macro-lmtp.o:		transports/lmtp.c
-	@echo "$(CC) -DMACRO_PREDEF transports/lmtp.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/lmtp.c
-macro-pipe.o :		transports/pipe.c
-	@echo "$(CC) -DMACRO_PREDEF transports/pipe.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/pipe.c
-macro-queuefile.o :	transports/queuefile.c
-	@echo "$(CC) -DMACRO_PREDEF transports/queuefile.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/queuefile.c
-macro-smtp.o :		transports/smtp.c
-	@echo "$(CC) -DMACRO_PREDEF transports/smtp.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/smtp.c
-macro-accept.o :	routers/accept.c
-	@echo "$(CC) -DMACRO_PREDEF routers/accept.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/accept.c
-macro-dnslookup.o :	routers/dnslookup.c
-	@echo "$(CC) -DMACRO_PREDEF routers/dnslookup.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/dnslookup.c
-macro-ipliteral.o :	routers/ipliteral.c
-	@echo "$(CC) -DMACRO_PREDEF routers/ipliteral.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/ipliteral.c
-macro-iplookup.o :	routers/iplookup.c
-	@echo "$(CC) -DMACRO_PREDEF routers/iplookup.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/iplookup.c
-macro-manualroute.o :	routers/manualroute.c
-	@echo "$(CC) -DMACRO_PREDEF routers/manualroute.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/manualroute.c
-macro-queryprogram.o :	routers/queryprogram.c
-	@echo "$(CC) -DMACRO_PREDEF routers/queryprogram.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/queryprogram.c
-macro-redirect.o :	routers/redirect.c
-	@echo "$(CC) -DMACRO_PREDEF routers/redirect.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/redirect.c
-macro-auth-spa.o :	auths/auth-spa.c
-	@echo "$(CC) -DMACRO_PREDEF auths/auth-spa.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/auth-spa.c
-macro-cram_md5.o :	auths/cram_md5.c
-	@echo "$(CC) -DMACRO_PREDEF auths/cram_md5.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/cram_md5.c
-macro-cyrus_sasl.o :	auths/cyrus_sasl.c
-	@echo "$(CC) -DMACRO_PREDEF auths/cyrus_sasl.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/cyrus_sasl.c
-macro-dovecot.o:	auths/dovecot.c
-	@echo "$(CC) -DMACRO_PREDEF auths/dovecot.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/dovecot.c
-macro-gsasl_exim.o :	auths/gsasl_exim.c
-	@echo "$(CC) -DMACRO_PREDEF auths/gsasl_exim.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl_exim.c
-macro-heimdal_gssapi.o:	auths/heimdal_gssapi.c
-	@echo "$(CC) -DMACRO_PREDEF auths/heimdal_gssapi.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/heimdal_gssapi.c
-macro-plaintext.o :	auths/plaintext.c
-	@echo "$(CC) -DMACRO_PREDEF auths/plaintext.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/plaintext.c
-macro-spa.o :		auths/spa.c
-	@echo "$(CC) -DMACRO_PREDEF auths/spa.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/spa.c
-macro-tls.o:		auths/tls.c
-	@echo "$(CC) -DMACRO_PREDEF auths/tls.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
-macro-dkim.o:		dkim.c
-	@echo "$(CC) -DMACRO_PREDEF dkim.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ dkim.c
+$(OBJ_MACRO_PLAIN):	macro-%.o : %.c
+	@echo "$(CC) -DMACRO_PREDEF $<"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+$(OBJ_MACRO_TP):	macro-%.o : transports/%.c
+	@echo "$(CC) -DMACRO_PREDEF $<"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+$(OBJ_MACRO_RT):	macro-%.o : routers/%.c
+	@echo "$(CC) -DMACRO_PREDEF $<"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+$(OBJ_MACRO_AU):	macro-%.o : auths/%.c
+	@echo "$(CC) -DMACRO_PREDEF $<"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
 
 macro_predef: $(OBJ_MACRO)
 	@echo "$(LNCC) -o $@"
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 22e5a4bd7..f29d160ed 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -110,7 +110,7 @@ for f in blob.h dbfunctions.h dbstuff.h exim.h functions.h globals.h \
   tod.c transport.c tree.c verify.c version.c \
   dkim.c dkim.h dkim_transport.c dmarc.c dmarc.h \
   valgrind.h memcheck.h \
-  macro_predef.c macro_predef.h
+  predef.c predef.h
 do
   ln -s ../src/$f $f
 done
diff --git a/src/src/dkim.c b/src/src/dkim.c
index 41540b39d..dd176127a 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -15,7 +15,7 @@
 # include "pdkim/pdkim.h"
 
 # ifdef MACRO_PREDEF
-#  include "macro_predef.h"
+#  include "predef.h"
 
 void
 dkim_params(void)
diff --git a/src/src/macro_predef.c b/src/src/predef.c
index ba1934885..8ef11272d 100644
--- a/src/src/macro_predef.c
+++ b/src/src/predef.c
@@ -9,7 +9,7 @@
 included in the main Exim build */
 
 #include "exim.h"
-#include "macro_predef.h"
+#include "predef.h"
 
 unsigned mp_index = 0;
 
diff --git a/src/src/macro_predef.h b/src/src/predef.h
index aece28cc7..aece28cc7 100644
--- a/src/src/macro_predef.h
+++ b/src/src/predef.h
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 70ce78f1f..ebadb0233 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -12,7 +12,7 @@ implementation of the conditional .ifdef etc. */
 #include "exim.h"
 
 #ifdef MACRO_PREDEF
-# include "macro_predef.h"
+# include "predef.h"
 #endif
 
 static uschar * syslog_facility_str;
diff --git a/src/src/route.c b/src/src/route.c
index 1b9676f3f..f33a11063 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -145,7 +145,7 @@ int optionlist_routers_size = nelem(optionlist_routers);
 
 #ifdef MACRO_PREDEF
 
-# include "macro_predef.h"
+# include "predef.h"
 
 void
 options_routers(void)
diff --git a/src/src/transport.c b/src/src/transport.c
index 89f1d74bd..6caeeecc9 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -90,7 +90,7 @@ int optionlist_transports_size = nelem(optionlist_transports);
 
 #ifdef MACRO_PREDEF
 
-# include "macro_predef.h"
+# include "predef.h"
 
 void
 options_transports(void)