git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1130bfb
)
Use RM_COMMAND everywhere during building.
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 12 Sep 2005 13:50:03 +0000
(13:50 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 12 Sep 2005 13:50:03 +0000
(13:50 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/ACKNOWLEDGMENTS
patch
|
blob
|
history
src/Makefile
patch
|
blob
|
history
src/OS/Makefile-Base
patch
|
blob
|
history
src/src/auths/Makefile
patch
|
blob
|
history
src/src/lookups/Makefile
patch
|
blob
|
history
src/src/routers/Makefile
patch
|
blob
|
history
src/src/transports/Makefile
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index 5b1c2fa4cdda77def75598a39887dc72880278d5..a4af4ef3bd5a9f3bc0a4b5d063dd9301fc86f2e7 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.22
0 2005/09/12 13:39:31
ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.22
1 2005/09/12 13:50:03
ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
Change log file for Exim from version 4.21
-------------------------------------------
@@
-162,6
+162,8
@@
PH/38 When log_selector = +received_sender was set, and the addition of the
PH/39 Added a new log selector, "unknown_in_list", which provokes a log entry
when the result of a list match is failure because a DNS lookup failed.
PH/39 Added a new log selector, "unknown_in_list", which provokes a log entry
when the result of a list match is failure because a DNS lookup failed.
+PH/40 RM_COMMAND is now used in the building process.
+
Exim version 4.52
-----------------
Exim version 4.52
-----------------
diff --git
a/src/ACKNOWLEDGMENTS
b/src/ACKNOWLEDGMENTS
index 6800012e7225b5e11da401a22d9019668e492b70..238b52d2aec181120898f2c0184a7fdf901ee87c 100644
(file)
--- a/
src/ACKNOWLEDGMENTS
+++ b/
src/ACKNOWLEDGMENTS
@@
-1,4
+1,4
@@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.3
3 2005/09/06 13:17:36
ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.3
4 2005/09/12 13:50:03
ph10 Exp $
EXIM ACKNOWLEDGEMENTS
EXIM ACKNOWLEDGEMENTS
@@
-20,7
+20,7
@@
relatively small patches.
Philip Hazel
Lists created: 20 November 2002
Philip Hazel
Lists created: 20 November 2002
-Last updated:
06
September 2005
+Last updated:
12
September 2005
THE OLD LIST
THE OLD LIST
@@
-152,6
+152,7
@@
Steve Haslam Lots of stuff, including
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
+Bryan Henderson Patch to use RM_COMMAND everywhere during building
Jakob Hirsch Patch for % operator
Kjetil Torgrim Homme Patch for require_files problem on NFS file systems
Tom Hughes Suggested patch for $n bug in pipe command from filter
Jakob Hirsch Patch for % operator
Kjetil Torgrim Homme Patch for require_files problem on NFS file systems
Tom Hughes Suggested patch for $n bug in pipe command from filter
diff --git
a/src/Makefile
b/src/Makefile
index 463955ccfeeee86786d03e6f1b7d3301b7700dd1..8702df9fbb4d8a2a5a42b6494bbeda50eac3ed0b 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/Makefile,v 1.
2 2004/10/11 13:24:19
ph10 Exp $
+# $Cambridge: exim/src/Makefile,v 1.
3 2005/09/12 13:50:03
ph10 Exp $
# Top-level makefile for Exim; handles creating a build directory with
# appropriate links, and then creating and running the main makefile in that
# Top-level makefile for Exim; handles creating a build directory with
# appropriate links, and then creating and running the main makefile in that
@@
-13,6
+13,7
@@
# or "make" must be called with a different SHELL= setting.
SHELL=/bin/sh
# or "make" must be called with a different SHELL= setting.
SHELL=/bin/sh
+RM_COMMAND=/bin/rm
# If a build name has not been specified by running this make file via a
# command of the form "make build=xxxx", then determine the name of the
# If a build name has not been specified by running this make file via a
# command of the form "make build=xxxx", then determine the name of the
@@
-58,7
+59,7
@@
configure: build-directory
# "configure", which doesn't force it).
makefile: build-directory
# "configure", which doesn't force it).
makefile: build-directory
- @cd build-$(buildname);
/bin/rm
-f Makefile; \
+ @cd build-$(buildname);
$(RM_COMMAND)
-f Makefile; \
build=$(build) $(SHELL) ../scripts/Configure-Makefile
# Go to the build directory and do the business
build=$(build) $(SHELL) ../scripts/Configure-Makefile
# Go to the build directory and do the business
@@
-77,12
+78,12
@@
clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
@echo '*** Use "make makefile" to force a rebuild of the makefile'
@echo ""
cd build-$(buildname); \
@echo '*** Use "make makefile" to force a rebuild of the makefile'
@echo ""
cd build-$(buildname); \
-
/bin/rm
-f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+
$(RM_COMMAND)
-f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
routers/*.o routers/*.a transports/*.o transports/*.a \
pcre/*.o pcre/*.a
clean_exim:; cd build-$(buildname); \
routers/*.o routers/*.a transports/*.o transports/*.a \
pcre/*.o pcre/*.a
clean_exim:; cd build-$(buildname); \
-
/bin/rm
-f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+
$(RM_COMMAND)
-f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
routers/*.o routers/*.a transports/*.o transports/*.a
# End of top-level makefile
routers/*.o routers/*.a transports/*.o transports/*.a
# End of top-level makefile
diff --git
a/src/OS/Makefile-Base
b/src/OS/Makefile-Base
index ddfe23ae4c91c6f6841723c30564b10426efecbc..2b805d87051622f365cb315a75a6b6de21b6fe89 100644
(file)
--- a/
src/OS/Makefile-Base
+++ b/
src/OS/Makefile-Base
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/OS/Makefile-Base,v 1.
7 2005/06/27 10:24:4
3 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-Base,v 1.
8 2005/09/12 13:50:0
3 ph10 Exp $
# This file is the basis of the main makefile for Exim and friends. The
# makefile at the top level arranges to build the main makefile by calling
# This file is the basis of the main makefile for Exim and friends. The
# makefile at the top level arranges to build the main makefile by calling
@@
-655,7
+655,7
@@
$(MONBIN): $(HDRS)
buildpcre:
@(cd pcre; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" \
FE="$(FE)" CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" \
buildpcre:
@(cd pcre; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" \
FE="$(FE)" CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" \
- RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ RANLIB="$(RANLIB)"
RM_COMMAND="$(RM_COMMAND)"
HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)")
@if $(SHELL) $(SCRIPTS)/newer pcre/libpcre.a exim; then \
rm -f exim eximon.bin; fi
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)")
@if $(SHELL) $(SCRIPTS)/newer pcre/libpcre.a exim; then \
rm -f exim eximon.bin; fi
@@
-665,7
+665,7
@@
buildpcre:
buildlookups:
@cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
buildlookups:
@cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)"
RM_COMMAND="$(RM_COMMAND)"
HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \
echo " "
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \
echo " "
@@
-673,7
+673,7
@@
buildlookups:
buildrouters:
@cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
buildrouters:
@cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)"
RM_COMMAND="$(RM_COMMAND)"
HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
@@
-681,7
+681,7
@@
buildrouters:
buildtransports:
@cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
buildtransports:
@cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)"
RM_COMMAND="$(RM_COMMAND)"
HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
@@
-689,7
+689,7
@@
buildtransports:
buildauths:
@cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
buildauths:
@cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
- FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+ FE="$(FE)" RANLIB="$(RANLIB)"
RM_COMMAND="$(RM_COMMAND)"
HDRS="$(PHDRS)" \
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
echo " "
diff --git
a/src/src/auths/Makefile
b/src/src/auths/Makefile
index f4a05648b1763d99ad22887dcf8c6ccc3c8b1d88..0d40d45271ae79d805577416765aa8ccf75a2336 100644
(file)
--- a/
src/src/auths/Makefile
+++ b/
src/src/auths/Makefile
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/src/auths/Makefile,v 1.
2 2005/05/17 09:53:34
ph10 Exp $
+# $Cambridge: exim/src/src/auths/Makefile,v 1.
3 2005/09/12 13:50:03
ph10 Exp $
# Make file for building a library containing all the available authorization
# methods, and calling it auths.a. In addition, there are functions that are
# Make file for building a library containing all the available authorization
# methods, and calling it auths.a. In addition, there are functions that are
@@
-12,11
+12,11
@@
OBJ = b64encode.o b64decode.o call_pam.o call_pwcheck.o call_radius.o \
cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o
auths.a: $(OBJ)
cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o
auths.a: $(OBJ)
- @
/bin/rm
-f auths.a
+ @
$(RM_COMMAND)
-f auths.a
@echo "$(AR) auths.a"
$(FE)$(AR) auths.a $(OBJ)
$(RANLIB) $@
@echo "$(AR) auths.a"
$(FE)$(AR) auths.a $(OBJ)
$(RANLIB) $@
- @
/bin/rm
-rf ../drtables.o
+ @
$(RM_COMMAND)
-rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
diff --git
a/src/src/lookups/Makefile
b/src/src/lookups/Makefile
index 709ab143a6a6e3ab68c6d18392a17160d4b13d23..59237263cbf1cce7095845334fe2ecd0513f7968 100644
(file)
--- a/
src/src/lookups/Makefile
+++ b/
src/src/lookups/Makefile
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/src/lookups/Makefile,v 1.
4 2005/08/01 13:20:28
ph10 Exp $
+# $Cambridge: exim/src/src/lookups/Makefile,v 1.
5 2005/09/12 13:50:03
ph10 Exp $
# Make file for building a library containing all the available lookups and
# calling it lookups.a. This is called from the main make file, after cd'ing
# Make file for building a library containing all the available lookups and
# calling it lookups.a. This is called from the main make file, after cd'ing
@@
-10,11
+10,11
@@
OBJ = cdb.o dbmdb.o dnsdb.o dsearch.o ibase.o ldap.o lsearch.o mysql.o nis.o \
lf_check_file.o lf_quote.o
lookups.a: $(OBJ)
lf_check_file.o lf_quote.o
lookups.a: $(OBJ)
- @
/bin/rm
-f lookups.a
+ @
$(RM_COMMAND)
-f lookups.a
@echo "$(AR) lookups.a"
@$(AR) lookups.a $(OBJ)
$(RANLIB) $@
@echo "$(AR) lookups.a"
@$(AR) lookups.a $(OBJ)
$(RANLIB) $@
- @
/bin/rm
-rf ../drtables.o
+ @
$(RM_COMMAND)
-rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
diff --git
a/src/src/routers/Makefile
b/src/src/routers/Makefile
index 4895344dba457d8f2453b2b3e2008df382e48377..637122b1d75991a6278b1193c671f7b9aa61da01 100644
(file)
--- a/
src/src/routers/Makefile
+++ b/
src/src/routers/Makefile
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/src/routers/Makefile,v 1.
2 2005/05/17 09:53:35
ph10 Exp $
+# $Cambridge: exim/src/src/routers/Makefile,v 1.
3 2005/09/12 13:50:03
ph10 Exp $
# Make file for building a library containing all the available routers and
# calling it routers.a. This is called from the main make file, after cd'ing
# Make file for building a library containing all the available routers and
# calling it routers.a. This is called from the main make file, after cd'ing
@@
-14,11
+14,11
@@
OBJ = accept.o dnslookup.o ipliteral.o iplookup.o manualroute.o \
rf_set_ugid.o
routers.a: $(OBJ)
rf_set_ugid.o
routers.a: $(OBJ)
- @
/bin/rm
-f routers.a
+ @
$(RM_COMMAND)
-f routers.a
@echo "$(AR) routers.a"
@$(AR) routers.a $(OBJ)
$(RANLIB) $@
@echo "$(AR) routers.a"
@$(AR) routers.a $(OBJ)
$(RANLIB) $@
- @
/bin/rm
-rf ../drtables.o
+ @
$(RM_COMMAND)
-rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
diff --git
a/src/src/transports/Makefile
b/src/src/transports/Makefile
index fdbf3e8441fcbd45c4c9b5f53ab3ffa3eedbb926..2cbeb7c50e8702ec87e111bd2c9a71304ddb8a1d 100644
(file)
--- a/
src/src/transports/Makefile
+++ b/
src/src/transports/Makefile
@@
-1,4
+1,4
@@
-# $Cambridge: exim/src/src/transports/Makefile,v 1.
2 2005/05/17 09:53:35
ph10 Exp $
+# $Cambridge: exim/src/src/transports/Makefile,v 1.
3 2005/09/12 13:50:04
ph10 Exp $
# Make file for building a library containing all the available transports and
# calling it transports.a. This is called from the main make file, after cd'ing
# Make file for building a library containing all the available transports and
# calling it transports.a. This is called from the main make file, after cd'ing
@@
-7,11
+7,11
@@
OBJ = appendfile.o autoreply.o lmtp.o pipe.o smtp.o tf_maildir.o
transports.a: $(OBJ)
OBJ = appendfile.o autoreply.o lmtp.o pipe.o smtp.o tf_maildir.o
transports.a: $(OBJ)
- @
/bin/rm
-f transports.a
+ @
$(RM_COMMAND)
-f transports.a
@echo "$(AR) transports.a"
@$(AR) transports.a $(OBJ)
$(RANLIB) $@
@echo "$(AR) transports.a"
@$(AR) transports.a $(OBJ)
$(RANLIB) $@
- @
/bin/rm
-rf ../drtables.o
+ @
$(RM_COMMAND)
-rf ../drtables.o
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"
.SUFFIXES: .o .c
.c.o:; @echo "$(CC) $*.c"