Fix Makefile.Microsoft_nmake header dependencies

crypto_kem/kyber768/clean/Makefile.Microsoft_nmake

@@ -4,12 +4,15 @@
 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
+CFLAGS=/nologo /I ..\..\..\common /W4 /WX
 
 all: $(LIBRARY)
 
+# Make sure objects are recompiled if headers change.
+$(OBJECTS): *.h
+
 $(LIBRARY): $(OBJECTS)
-    LIB.EXE /OUT:$@ $**
+    LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
 clean:
     -DEL $(OBJECTS)

crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake

@@ -4,12 +4,15 @@
 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
+CFLAGS=/nologo /I ..\..\..\common /W1 /WX # FIXME: ideally would use /W4 instead of /W1, but too many failures in Dilithium right now
 
 all: $(LIBRARY)
 
+# Make sure objects are recompiled if headers change.
+$(OBJECTS): *.h
+
 $(LIBRARY): $(OBJECTS)
-	LIB.EXE /OUT:$@ $**
+	LIB.EXE /NOLOGO /WX /OUT:$@ $**
 
 clean:
     -DEL $(OBJECTS)

scripts_windows/build_all.bat

@@ -27,9 +27,9 @@ FOR %%T IN (kem sign) DO (
     CD %%K
     FOR /D %%L IN (*) DO (
       CD ..\..\test
-      nmake /f Makefile.Microsoft_nmake /E TYPE=%%T SCHEME=%%K SCHEME_UPPERCASE=!schemeuppercase! IMPLEMENTATION=%%L clean
+      nmake /NOLOGO /f Makefile.Microsoft_nmake /E TYPE=%%T SCHEME=%%K SCHEME_UPPERCASE=!schemeuppercase! IMPLEMENTATION=%%L clean
       IF ERRORLEVEL 1 SET EL=4
-      nmake /f Makefile.Microsoft_nmake /E TYPE=%%T SCHEME=%%K SCHEME_UPPERCASE=!schemeuppercase! IMPLEMENTATION=%%L
+      nmake /NOLOGO /f Makefile.Microsoft_nmake /E TYPE=%%T SCHEME=%%K SCHEME_UPPERCASE=!schemeuppercase! IMPLEMENTATION=%%L
       IF ERRORLEVEL 1 SET EL=5
       CD ..
       bin\functest_%%K_%%L

test/Makefile.Microsoft_nmake

@@ -17,7 +17,7 @@ COMMON_OBJECTS_NOPATH=fips202.obj sha2.obj
 
 DEST_DIR=..\bin
 
-CFLAGS=/I $(COMMON_DIR) /W4 /WX
+CFLAGS=/nologo /I $(COMMON_DIR) /W4 /WX
 
 all: $(DEST_DIR)\functest_$(SCHEME)_$(IMPLEMENTATION).EXE $(DEST_DIR)\testvectors_$(SCHEME)_$(IMPLEMENTATION).EXE
 

test/helpers.py

@@ -39,7 +39,8 @@ def make(*args, working_dir='.', env=None, expected_returncode=0, **kwargs):
         make('clean', 'targetb', SCHEME='bla')
     """
     if os.name == 'nt':
-        make_command = ['nmake', '/f', 'Makefile.Microsoft_nmake', '/E']
+        make_command = ['nmake', '/f', 'Makefile.Microsoft_nmake',
+                        '/NOLOGO', '/E']
         # we need SCHEME_UPPERCASE and IMPLEMENTATION_UPPERCASE with nmake
         for envvar in ['IMPLEMENTATION', 'SCHEME']:
             if envvar in kwargs: