From 24e28e34028e70e32ce8199fd16460ab17de80d0 Mon Sep 17 00:00:00 2001 From: Douglas Stebila Date: Fri, 8 Feb 2019 09:42:53 -0500 Subject: [PATCH] Use a single Makefile for BSD and GNU Make and add comments --- crypto_kem/kyber768/clean/{GNUmakefile => Makefile} | 6 +++--- crypto_kem/kyber768/clean/Makefile.Microsoft_nmake | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) rename crypto_kem/kyber768/clean/{GNUmakefile => Makefile} (59%) diff --git a/crypto_kem/kyber768/clean/GNUmakefile b/crypto_kem/kyber768/clean/Makefile similarity index 59% rename from crypto_kem/kyber768/clean/GNUmakefile rename to crypto_kem/kyber768/clean/Makefile index 27703b5a..616dcbf3 100644 --- a/crypto_kem/kyber768/clean/GNUmakefile +++ b/crypto_kem/kyber768/clean/Makefile @@ -1,7 +1,7 @@ -LIB=libkyber768_clean.a +# This Makefile has been tested with GNU Make and BSD Make -SOURCES=$(wildcard *.c) -OBJECTS=$(patsubst %.c,%.o,$(SOURCES)) +LIB=libkyber768_clean.a +OBJECTS=cbd.o indcpa.o kem.o kex.o ntt.o poly.o polyvec.o precomp.o reduce.o verify.o CFLAGS=-Wall -Wextra -Wpedantic -Werror -std=c99 -I../../../common $(EXTRAFLAGS) diff --git a/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake b/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake index 13f3d73a..af4b6833 100644 --- a/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake +++ b/crypto_kem/kyber768/clean/Makefile.Microsoft_nmake @@ -1,5 +1,7 @@ -LIB=libkyber768_clean.lib +# This Makefile can be used with Microsoft Visual Studio's nmake using the command: +# nmake /f Makefile.Microsoft_nmake +LIB=libkyber768_clean.lib OBJECTS=cbd.obj indcpa.obj kem.obj kex.obj ntt.obj poly.obj polyvec.obj precomp.obj reduce.obj verify.obj CFLAGS=/I ..\..\..\common /W1 /WX # FIXME: ideally would use /W4 instead of /W1, but too many failures in Kyber right now