SPF: better buld compatibility with OpenBSD

[exim.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 26631f39852b531239847dd2db959b5002b3030f..6d3bc55502d1bf660ee209eeee17660ba00e799e 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,11 +4,10 @@
 # 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@
 CLIENT_SSL=@CLIENT_SSL@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@
 LDFLAGS=@LDFLAGS@
 CLIENT_SSL=@CLIENT_SSL@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@

-B64_GNUTLS=@B64_GNUTLS@

 LOADED=@LOADED@
 LOADED_OPT=@LOADED_OPT@
 LIBS=@LIBS@
 LOADED=@LOADED@
 LOADED_OPT=@LOADED_OPT@
 LIBS=@LIBS@


@@ -19,8 +18,7 @@ SRC = @srcdir@/src
 
 BINARIES =     bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \
                 bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \
 
 BINARIES =     bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \
                 bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \

-                bin/mtpscript bin/server bin/showids bin/locate \
-               $(B64_GNUTLS)
+                bin/mtpscript bin/server bin/showids bin/locate

 
 # List of targets
 
 
 # List of targets
 


@@ -87,10 +85,6 @@ bin/locate:     $(SRC)/locate.sh Makefile
                cp $(SRC)/locate.pl bin/locate
                chmod 0755 bin/locate
 
                cp $(SRC)/locate.pl bin/locate
                chmod 0755 bin/locate
 

-bin/ed25519_privkey_pem_to_pubkey_raw_b64:     $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c Makefile
-               $(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/ed25519_privkey_pem_to_pubkey_raw_b64 \
-                       $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c  -lgnutls -lgcrypt $(LIBS)
-

 clean:;         rm -rf $(BINARIES) bin.sys
 
 FORCE:
 clean:;         rm -rf $(BINARIES) bin.sys
 
 FORCE: