Fix makefiles

crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-128f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-128f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-128s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-128s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-192f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-192f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-192s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-192s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-256f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-256f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-256s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_robust.obj hash_sha256x8.obj thash_sha256_robustx8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-sha256-256s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx8.obj fors.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx8.obj sha256avx.obj sha256x8.obj fors.obj hash_sha256x8.obj sign.obj hash_sha256.obj thash_sha256_simple.obj hash_sha256x8.obj thash_sha256_simplex8.obj sha256.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-128f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-128f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-128f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-128f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-128f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-128f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-128s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-128s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-128s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-128s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-128s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-128s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-192f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-192f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-192f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-192f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-192f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-192f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-192s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-192s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-192s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-192s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-192s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-192s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-256f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-256f-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-256f-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-256f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-256f-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-256f-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-256s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_robust.o hash_shake256x4.o thash_shake256_robustx4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-256s-robust/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-256s-robust_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_robust.obj hash_shake256x4.obj thash_shake256_robustx4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX
 

crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile

@@ -3,7 +3,7 @@
 LIB=libsphincs-shake256-256s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx4.h fips202x4.h fors.h api.h hash.h hashx4.h hash_state.h thash.h thashx4.h 
-OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o hash_shake256x4.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
+OBJECTS =          address.o wots.o utils.o utilsx4.o fips202x4.o fors.o sign.o hash_shake256.o thash_shake256_simple.o hash_shake256x4.o thash_shake256_simplex4.o
 
 KECCAK4XDIR=../../../common/keccak4x
 KECCAK4XOBJ=KeccakP-1600-times4-SIMD256.o

crypto_sign/sphincs-shake256-256s-simple/avx2/Makefile.Microsoft_nmake

@@ -2,7 +2,7 @@
 #    nmake /f Makefile.Microsoft_nmake
 
 LIBRARY=libsphincs-shake256-256s-simple_avx2.lib
-OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
+OBJECTS=address.obj wots.obj utils.obj utilsx4.obj fips202x4.obj fors.obj sign.obj hash_shake256.obj thash_shake256_simple.obj hash_shake256x4.obj thash_shake256_simplex4.obj
 
 CFLAGS=/nologo /arch:AVX2 /O2 /I ..\..\..\common /W4 /WX