X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4c04137d73637107669e02b21f890387aaa2ef34..e0b3815dc398d7abaa1f81c9f26b1c9b050e94c0:/test/Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 3d7810c8b..f7a2a4695 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,15 +17,20 @@ SRC = @srcdir@/src
 
 ##############################################################################
 
+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 \
+
 # List of targets
 
-all:            makebin bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \
-                bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \
-                bin/mtpscript bin/server bin/showids
+all:            binaries sysbinaries
 
-# Ensure the bin directory exists
+binaries:	$(BINARIES)
 
-makebin:;       @if [ ! -e bin ] ; then mkdir bin 2>/dev/null; echo ""; fi
+sysbinaries:	FORCE binaries
+		rm -f bin.sys/*
+		bin/locate initdb postgres pg_ctl psql mysqld mysql
+		ls -la bin.sys
 
 # Compile and link the programs:
 #
@@ -43,64 +49,49 @@ makebin:;       @if [ ! -e bin ] ; then mkdir bin 2>/dev/null; echo ""; fi
 
 bin/cf:         $(SRC)/cf.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/cf $(SRC)/cf.c
-		@echo ">>> bin/cf command build"
-		@echo " "
 
 bin/client:     $(SRC)/client.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/client $(SRC)/client.c $(LIBS)
-		@echo ">>> bin/client command built"
-		@echo " "
 
 bin/client-gnutls: $(SRC)/client.c Makefile
 		$(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/client-gnutls $(SRC)/client.c -lgnutls -lgcrypt $(LIBS)
-		@echo ">>> bin/client-gnutls command built"
-		@echo " "
 
 bin/client-ssl: $(SRC)/client.c Makefile
 		$(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl $(SRC)/client.c -lssl -lcrypto $(LIBS)
-		@echo ">>> bin/client-ssl command built"
-		@echo " "
+
+$(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
-		@echo ">>> bin/checkaccess command built"
-		@echo " "
 
 bin/fakens:     $(SRC)/fakens.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/fakens $(SRC)/fakens.c $(LIBS)
-		@echo ">>> bin/fakens command built"
-		@echo " "
 
 bin/fd:         $(SRC)/fd.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/fd $(SRC)/fd.c
-		@echo ">>> bin/fd command built"
-		@echo " "
 
 bin/iefbr14:    $(SRC)/iefbr14.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/iefbr14 $(SRC)/iefbr14.c
-		@echo ">>> bin/iefbr14 command built"
-		@echo " "
 
 bin/loaded:     $(SRC)/loaded.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) $(LOADED_OPT) -o bin/loaded $(SRC)/loaded.c
-		@echo ">>> bin/loaded command built"
-		@echo " "
 
 bin/mtpscript:  $(SRC)/mtpscript.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) $(mtpscript_OPT) -o bin/mtpscript $(SRC)/mtpscript.c
-		@echo ">>> bin/mtpscript command built"
-		@echo " "
 
 bin/server:     $(SRC)/server.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/server $(SRC)/server.c $(LIBS)
-		@echo ">>> bin/server command built"
-		@echo " "
 
 bin/showids:    $(SRC)/showids.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
-		@echo ">>> bin/showids command built"
-		@echo " "
 
-clean:;         rm -rf bin/*
+bin/locate:     $(SRC)/locate.sh Makefile
+		cp $(SRC)/locate.pl bin/locate
+		chmod 0755 bin/locate
+
+clean:;         rm -rf $(BINARIES) bin.sys
+
+FORCE:
 
 # End