[exim-cvs] fix clang build

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] fix clang build
Gitweb: https://git.exim.org/exim.git/commitdiff/aa091f5c136d0f5b13ca6d6eb3e2dd0bcadcf8eb
Commit:     aa091f5c136d0f5b13ca6d6eb3e2dd0bcadcf8eb
Parent:     bd00747fd1f849671c86379f9f098dd72bce118a
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Aug 15 19:38:30 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Aug 15 19:38:30 2024 +0100


    fix clang build
---
 src/src/routers/Makefile    |  3 ++-
 src/src/transports/Makefile | 26 +++++++++++---------------
 2 files changed, 13 insertions(+), 16 deletions(-)


diff --git a/src/src/routers/Makefile b/src/src/routers/Makefile
index 8ff3d81ab..738e35147 100644
--- 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
-#     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

diff --git a/src/src/transports/Makefile b/src/src/transports/Makefile
index 8f759ecf0..43418fd22 100644
--- 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
-#     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

+OBJ += smtp_socks.o tf_maildir.o
+
 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)
@@ -28,30 +31,23 @@ transports.a:    $(OBJ)


$(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
+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 $@


-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


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/