From d503a712ba76ae64e9a0c2013b8b28404c85e3e0 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Mon, 4 Mar 2019 16:53:38 +0100 Subject: [PATCH] Fix nmakefiles LIB is already an environment variable on Windows --- crypto_kem/kyber768/clean/Makefile.Microsoft_nmake | 10 +++++----- .../dilithium-iii/clean/Makefile.Microsoft_nmake | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake b/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake index bbf54ce0..13f435ee 100644 --- a/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake +++ b/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake @@ -1,16 +1,16 @@ # This Makefile can be used with Microsoft Visual Studio's nmake using the command: # nmake /f Makefile.Microsoft_nmake -LIB=libkyber768_clean.lib +LIBRARY=libkyber768_clean.lib OBJECTS=cbd.obj indcpa.obj kem.obj ntt.obj poly.obj polyvec.obj precomp.obj reduce.obj verify.obj CFLAGS=/I ..\..\..\common /W4 /WX -all: $(LIB) +all: $(LIBRARY) -$(LIB): $(OBJECTS) +$(LIBRARY): $(OBJECTS) LIB.EXE /OUT:$@ $** clean: - DEL $(OBJECTS) - DEL $(LIB) + -DEL $(OBJECTS) + -DEL $(LIBRARY) diff --git a/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake index 18cc6db9..12a49210 100644 --- a/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake +++ b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake @@ -1,16 +1,16 @@ # This Makefile can be used with Microsoft Visual Studio's nmake using the command: # nmake /f Makefile.Microsoft_nmake -LIB=libdilithium-iii_clean.lib +LIBRARY=libdilithium-iii_clean.lib OBJECTS=ntt.obj packing.obj poly.obj polyvec.obj reduce.obj rounding.obj sign.obj CFLAGS=/I ..\..\..\common /W1 /WX # FIXME: ideally would use /W4 instead of /W1, but too many failures in Dilithium right now -all: $(LIB) +all: $(LIBRARY) -$(LIB): $(OBJECTS) +$(LIBRARY): $(OBJECTS) LIB.EXE /OUT:$@ $** clean: - DEL $(OBJECTS) - DEL $(LIB) + -DEL $(OBJECTS) + -DEL $(LIBRARY)