Consistently use EXEEXT_FOR_BUILD

This fixes cross building for cases where EXEEXT differs from
EXEEXT_FOR_BUILD, such as when building for windows from unix.

diff --git a/ChangeLog b/ChangeLog
index deadb26336e4e2308794ede5f2c02ac15f2030d7..9392a7547d4720edfdb58123ae68212bdbabea57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-23  Niels Möller  <nisse@lysator.liu.se>
+
+       From Martin Storsjö:
+       * Makefile.in: Consistently use EXEEXT_FOR_BUILD.
+
 2013-04-21  Niels Möller  <nisse@lysator.liu.se>
 
        * Makefile.in (DISTFILES): Added mini-gmp.c and mini-gmp.h.

diff --git a/Makefile.in b/Makefile.in
index c96e3a3640181e89252a958c1ddc54409a961c65..cbc001c79ec00aad3af24bc73b720c882328c8cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,8 +31,9 @@ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
 internal_SOURCES = nettle-internal.c
 internal_TARGETS = $(internal_SOURCES:.c=.$(OBJEXT))
 
-TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) twofishdata$(EXEEXT) \
-         shadata$(EXEEXT) gcmdata$(EXEEXT) \
+TARGETS = aesdata$(EXEEXT_FOR_BUILD) desdata$(EXEEXT_FOR_BUILD) \
+          twofishdata$(EXEEXT_FOR_BUILD) shadata$(EXEEXT_FOR_BUILD) \
+          gcmdata$(EXEEXT_FOR_BUILD) \
          $(getopt_TARGETS) $(internal_TARGETS) \
          $(LIBTARGETS) $(SHLIBTARGETS)
 IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
@@ -273,7 +274,7 @@ des.$(OBJEXT): des.c des.h $(des_headers)
 #      k =  7, c = 6, 320 entries, ~15 KB
 #      k =  9, c = 7, 512 entries, ~24 KB
 ecc-192.h: eccdata.stamp
-       ./eccdata$(EXEEXT) 192 7 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+       ./eccdata$(EXEEXT_FOR_BUILD) 192 7 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
 # Some possible choices for 224:
 #      k = 18, c = 4,  64 entries,  ~4 KB
 #      k = 24, c = 6, 128 entries,  ~8 KB
@@ -281,7 +282,7 @@ ecc-192.h: eccdata.stamp
 #      k =  8, c = 6, 320 entries, ~20 KB
 #      k = 10, c = 7, 512 entries, ~32 KB
 ecc-224.h: eccdata.stamp
-       ./eccdata$(EXEEXT) 224 12 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+       ./eccdata$(EXEEXT_FOR_BUILD) 224 12 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
 # Some possible choices for 256:
 #      k = 20, c = 4,  64 entries,  ~4 KB
 #      k = 27, c = 6, 128 entries,  ~8 KB
@@ -289,7 +290,7 @@ ecc-224.h: eccdata.stamp
 #      k =  9, c = 6, 320 entries, ~20 KB
 #      k = 12, c = 7, 512 entries, ~32 KB
 ecc-256.h: eccdata.stamp
-       ./eccdata$(EXEEXT) 256 14 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+       ./eccdata$(EXEEXT_FOR_BUILD) 256 14 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
 # Some possible choices for 384:
 #      k = 31, c = 4,  64 entries,  ~6 KB
 #      k = 41, c = 6, 128 entries, ~12 KB
@@ -297,7 +298,7 @@ ecc-256.h: eccdata.stamp
 #      k = 14, c = 6, 320 entries, ~30 KB
 #      k = 18, c = 7, 512 entries, ~48 KB
 ecc-384.h: eccdata.stamp
-       ./eccdata$(EXEEXT) 384 41 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+       ./eccdata$(EXEEXT_FOR_BUILD) 384 41 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
 # Some possible choices for 521:
 #      k = 42, c = 4,  64 entries,  ~9 KB
 #      k = 56, c = 6, 128 entries, ~18 KB
@@ -305,10 +306,10 @@ ecc-384.h: eccdata.stamp
 #      k = 19, c = 6, 320 entries, ~44 KB
 #      k = 24, c = 7, 512 entries, ~70 KB
 ecc-521.h: eccdata.stamp
-       ./eccdata$(EXEEXT) 521 56 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
+       ./eccdata$(EXEEXT_FOR_BUILD) 521 56 6 $(GMP_NUMB_BITS) > $@T && mv $@T $@
 
 eccdata.stamp: eccdata.c
-       $(MAKE) eccdata$(EXEEXT)
+       $(MAKE) eccdata$(EXEEXT_FOR_BUILD)
        echo stamp > eccdata.stamp
 
 ecc-192.$(OBJEXT): ecc-192.h
@@ -575,7 +576,7 @@ distcheck: dist
 clean-here:
        -rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s \
                ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h \
-               eccdata$(EXEEXT) eccdata.stamp
+               eccdata$(EXEEXT_FOR_BUILD) eccdata.stamp
        -rm -rf .lib
 
 distclean-here: clean-here