X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/cc285a9fa6dadcffc03350b18c05ce9ee95360d5..4a92bfe6da547eb599b76da068b8b908e1c509b7:/test/Makefile.in diff --git a/test/Makefile.in b/test/Makefile.in index c96fb4bdd..abfdcb8a7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -4,10 +4,11 @@ # 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@ -CLIENT_SSL=@CLIENT_SSL@ +CLIENT_OPENSSL=@CLIENT_OPENSSL@ CLIENT_GNUTLS=@CLIENT_GNUTLS@ +CLIENT_ANYTLS=@CLIENT_ANYTLS@ LOADED=@LOADED@ LOADED_OPT=@LOADED_OPT@ LIBS=@LIBS@ @@ -16,9 +17,9 @@ SRC = @srcdir@/src ############################################################################## -BINARIES = bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \ +BINARIES = bin/cf bin/client $(CLIENT_OPENSSL) $(CLIENT_GNUTLS) $(CLIENT_ANYTLS) \ 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 @@ -26,8 +27,8 @@ all: binaries sysbinaries binaries: $(BINARIES) -sysbinaries: FORCE - sh -x bin/locate initdb postgres pg_ctl mysqld +sysbinaries: FORCE binaries + bin/locate initdb postgres pg_ctl mysqld 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) +$(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 @@ -82,7 +86,8 @@ bin/showids: $(SRC)/showids.c Makefile $(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c bin/locate: $(SRC)/locate.sh Makefile - install -m 0755 $(SRC)/locate.sh bin/locate + cp $(SRC)/locate.pl bin/locate + chmod 0755 bin/locate clean:; rm -rf $(BINARIES) bin.sys