git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidy log.c
[exim.git]
/
test
/
Makefile.in
diff --git
a/test/Makefile.in
b/test/Makefile.in
index 0f229a2cc24f253f7eecc937f03a679d5842d5fd..abfdcb8a7d781279704919e8b88a641db8c36769 100644
(file)
--- a/
test/Makefile.in
+++ b/
test/Makefile.in
@@
-4,10
+4,11
@@
# These variables are set by the configure script.
CC=@CC@
# These variables are set by the configure script.
CC=@CC@
-CFLAGS=@CFLAGS@ @BIND_8_COMPAT@ @DEFS@
+CFLAGS=@CFLAGS@ @
CPPFLAGS@ @
BIND_8_COMPAT@ @DEFS@
LDFLAGS=@LDFLAGS@
LDFLAGS=@LDFLAGS@
-CLIENT_
SSL=@CLIENT_
SSL@
+CLIENT_
OPENSSL=@CLIENT_OPEN
SSL@
CLIENT_GNUTLS=@CLIENT_GNUTLS@
CLIENT_GNUTLS=@CLIENT_GNUTLS@
+CLIENT_ANYTLS=@CLIENT_ANYTLS@
LOADED=@LOADED@
LOADED_OPT=@LOADED_OPT@
LIBS=@LIBS@
LOADED=@LOADED@
LOADED_OPT=@LOADED_OPT@
LIBS=@LIBS@
@@
-16,9
+17,9
@@
SRC = @srcdir@/src
##############################################################################
##############################################################################
-BINARIES = bin/cf bin/client $(CLIENT_
SSL) $(CLIENT_GNU
TLS) \
+BINARIES = bin/cf bin/client $(CLIENT_
OPENSSL) $(CLIENT_GNUTLS) $(CLIENT_ANY
TLS) \
bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \
bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \
- bin/mtpscript bin/server bin/showids bin/locate
+ bin/mtpscript bin/server bin/showids bin/locate
\
# List of targets
# List of targets
@@
-27,7
+28,7
@@
all: binaries sysbinaries
binaries: $(BINARIES)
sysbinaries: FORCE binaries
binaries: $(BINARIES)
sysbinaries: FORCE binaries
-
sh -x
bin/locate initdb postgres pg_ctl mysqld
+ bin/locate initdb postgres pg_ctl mysqld
ls -la bin.sys
# Compile and link the programs:
ls -la bin.sys
# Compile and link the programs:
@@
-57,6
+58,9
@@
bin/client-gnutls: $(SRC)/client.c Makefile
bin/client-ssl: $(SRC)/client.c Makefile
$(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl $(SRC)/client.c -lssl -lcrypto $(LIBS)
bin/client-ssl: $(SRC)/client.c Makefile
$(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl $(SRC)/client.c -lssl -lcrypto $(LIBS)
+$(CLIENT_ANYTLS): $(CLIENT_GNUTLS) $(CLIENT_OPENSSL)
+ [ -n "$(CLIENT_GNUTLS)" ] && ln -sf `basename $(CLIENT_GNUTLS)` $@ || ln -sf `basename $(CLIENT_OPENSSL)` $@
+
bin/checkaccess:$(SRC)/checkaccess.c Makefile
$(CC) $(CFLAGS) -DNO_TLS $(LDFLAGS) -o bin/checkaccess $(SRC)/checkaccess.c
bin/checkaccess:$(SRC)/checkaccess.c Makefile
$(CC) $(CFLAGS) -DNO_TLS $(LDFLAGS) -o bin/checkaccess $(SRC)/checkaccess.c
@@
-82,7
+86,7
@@
bin/showids: $(SRC)/showids.c Makefile
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
bin/locate: $(SRC)/locate.sh Makefile
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
bin/locate: $(SRC)/locate.sh Makefile
- cp $(SRC)/locate.
sh
bin/locate
+ cp $(SRC)/locate.
pl
bin/locate
chmod 0755 bin/locate
clean:; rm -rf $(BINARIES) bin.sys
chmod 0755 bin/locate
clean:; rm -rf $(BINARIES) bin.sys