fix clang build

diff --git a/src/src/routers/Makefile b/src/src/routers/Makefile
index 8ff3d81ab17ca7983aa89e2a052268dcc1c3dcf3..738e351470d27793127013e35ea705866dbab6a5 100644 (file)
--- a/src/src/routers/Makefile
+++ b/src/src/routers/Makefile
@@ -7,7 +7,8 @@
 
 # nb: at build time, the version of this file used will have had some
 #     extra variable definitions and prepended to it and module build rules
 
 # nb: at build time, the version of this file used will have had some
 #     extra variable definitions and prepended to it and module build rules

-#     interpolated below. This is done by scripts/drivers-Makefile.
+#     interpolated below. This is done by scripts/drivers-Makefile with
+#     definitions from scripts/Configure-Makefile.

 
 # MAGIC-TAG-MODS-OBJ-RULES-GO-HERE
 
 
 # MAGIC-TAG-MODS-OBJ-RULES-GO-HERE
 

diff --git a/src/src/transports/Makefile b/src/src/transports/Makefile
index 8f759ecf010fba6da59fe2f69b13f5476633e80a..43418fd22effd6757f245b8c43cbc9dcfcfcb86d 100644 (file)
--- a/src/src/transports/Makefile
+++ b/src/src/transports/Makefile
@@ -6,13 +6,16 @@
 
 # nb: at build time, the version of this file used will have had some
 #     extra variable definitions and prepended to it and module build rules
 
 # nb: at build time, the version of this file used will have had some
 #     extra variable definitions and prepended to it and module build rules

-#     interpolated below. This is done by scripts/drivers-Makefile.
+#     interpolated below. This is done by scripts/drivers-Makefile with
+#     definitions from scripts/Configure-Makefile.

 
 # MAGIC-TAG-MODS-OBJ-RULES-GO-HERE
 
 
 # MAGIC-TAG-MODS-OBJ-RULES-GO-HERE
 

+OBJ += smtp_socks.o tf_maildir.o
+

 all:           transports.a $(MODS)
 
 all:           transports.a $(MODS)
 

-transports.a:    $(OBJ)
+transports.a:    $(OBJ) smtp_socks.o tf_maildir.o

                 @$(RM_COMMAND) -f transports.a
                 @echo "$(AR) transports.a"
                 @$(AR) transports.a $(OBJ)
                 @$(RM_COMMAND) -f transports.a
                 @echo "$(AR) transports.a"
                 @$(AR) transports.a $(OBJ)


@@ -28,30 +31,23 @@ transports.a:    $(OBJ)
 
 $(OBJ) $(MOD): $(HDRS)
 
 
 $(OBJ) $(MOD): $(HDRS)
 

+appendfile.o:                  appendfile.c appendfile.h tf_maildir.h

 autoreply.o autoreply.so:      autoreply.c autoreply.h
 lmtp.o lmtp.so:                        lmtp.c lmtp.h
 pipe.o pipe.so:                        pipe.c pipe.h
 queuefile.o queuefile.so:      queuefile.c queuefile.h
 autoreply.o autoreply.so:      autoreply.c autoreply.h
 lmtp.o lmtp.so:                        lmtp.c lmtp.h
 pipe.o pipe.so:                        pipe.c pipe.h
 queuefile.o queuefile.so:      queuefile.c queuefile.h

+smtp.o:                                smtp.c smtp.h
+smtp_socks.o:                  smtp_socks.c smtp.h
+
+tf_maildir.o:                  tf_maildir.c tf_maildir.h appendfile.h

 
 
 
 

-# These ones depend on more than one .c source

 
 

-appendfile.o:  appendfile.c appendfile.h tf_maildir.c tf_maildir.h
-       @echo "$(CC) appendfile.c tf_maildir.c"
-       $(FE)$(CC) $(CFLAGS) $(INCLUDE) appendfile.c tf_maildir.c -r -o $@
+# This depends on more than one .c source

 
 appendfile.so: appendfile.c appendfile.h tf_maildir.c tf_maildir.h
        @echo "$(CC) -shared appendfile.c tf_maildir.c"
        $(FE)$(CC) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) \
                appendfile.c tf_maildir.c -o $@
 
 
 appendfile.so: appendfile.c appendfile.h tf_maildir.c tf_maildir.h
        @echo "$(CC) -shared appendfile.c tf_maildir.c"
        $(FE)$(CC) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) \
                appendfile.c tf_maildir.c -o $@
 

-smtp.o:        smtp.c smtp_socks.c smtp.h
-       @echo "$(CC) smtp.c smtp_socks.c"
-       $(FE)$(CC) $(CFLAGS) $(INCLUDE) smtp.c smtp_socks.c -r -o $@
-
-smtp.so: smtp.c smtp_socks.c smtp.h
-       @echo "$(CC) -shared smtp.c smtp_socks.c"
-       $(FE)$(CC) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) \
-               smtp.c smtp_socks.c -o $@
-

 # End
 # End