Build: tidying

[users/jgh/exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 96b19cbad3553f18948a4b625c87c2e5d831c8cc..26f06eca6eaf45901d2af7d0bb48e00f2d90d28a 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -123,108 +123,42 @@ 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-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
+$(OBJ_MACRO_PLAIN):    macro-%.o : %.c
        @echo "$(CC) -DMACRO_PREDEF $<"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-globals.o :      globals.c
+$(OBJ_MACRO_TP):       macro-%.o : transports/%.c
        @echo "$(CC) -DMACRO_PREDEF $<"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-readconf.o :     readconf.c
+$(OBJ_MACRO_RT):       macro-%.o : routers/%.c
        @echo "$(CC) -DMACRO_PREDEF $<"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-route.o :                route.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-transport.o:     transport.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-drtables.o :     drtables.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-appendfile.o :   transports/appendfile.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-autoreply.o :    transports/autoreply.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-lmtp.o:          transports/lmtp.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-pipe.o :         transports/pipe.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-queuefile.o :    transports/queuefile.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-smtp.o :         transports/smtp.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-accept.o :       routers/accept.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-dnslookup.o :    routers/dnslookup.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-ipliteral.o :    routers/ipliteral.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-iplookup.o :     routers/iplookup.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-manualroute.o :  routers/manualroute.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-queryprogram.o : routers/queryprogram.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-redirect.o :     routers/redirect.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-auth-spa.o :     auths/auth-spa.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-cram_md5.o :     auths/cram_md5.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-cyrus_sasl.o :   auths/cyrus_sasl.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-dovecot.o:       auths/dovecot.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-gsasl_exim.o :   auths/gsasl_exim.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-heimdal_gssapi.o:        auths/heimdal_gssapi.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-plaintext.o :    auths/plaintext.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-spa.o :          auths/spa.c
-       @echo "$(CC) -DMACRO_PREDEF $<"
-       $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
-macro-tls.o:           auths/tls.c
+$(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 $<"
+       @echo "$(LNCC) -o $@"
        $(FE)$(LNCC) -o $@ $(LFLAGS) $(OBJ_MACRO)
 
 macro.c: macro_predef