From 3eb69c840d1f42d6584834406bd2fb9413a8293a Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sun, 24 Nov 2019 17:00:45 +0100 Subject: build sys fix --- code/ecp/crypto/Makefile | 2 +- code/ecp/crypto/arc4random/Makefile | 2 +- code/ecp/crypto/chacha/Makefile | 2 +- code/ecp/crypto/compat/Makefile | 2 +- code/ecp/crypto/curve25519/Makefile | 2 +- code/ecp/crypto/poly1305/Makefile | 2 +- code/ecp/crypto/sha/Makefile | 2 +- code/ecp/crypto/test/Makefile | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) (limited to 'code/ecp/crypto') diff --git a/code/ecp/crypto/Makefile b/code/ecp/crypto/Makefile index 6f07ec6..ecef58d 100644 --- a/code/ecp/crypto/Makefile +++ b/code/ecp/crypto/Makefile @@ -1,5 +1,5 @@ include ../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -Iinclude -I.. -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= +CFLAGS += $(PIC) -Iinclude -I.. -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= obj = crypto.o e_chacha20poly1305.o obj_dep = compat/explicit_bzero.o compat/timingsafe_memcmp.o compat/timingsafe_bcmp.o \ diff --git a/code/ecp/crypto/arc4random/Makefile b/code/ecp/crypto/arc4random/Makefile index 3d74290..387bca1 100755 --- a/code/ecp/crypto/arc4random/Makefile +++ b/code/ecp/crypto/arc4random/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) +CFLAGS += $(PIC) obj = arc4random.o diff --git a/code/ecp/crypto/chacha/Makefile b/code/ecp/crypto/chacha/Makefile index 1bafa7f..bd747e5 100644 --- a/code/ecp/crypto/chacha/Makefile +++ b/code/ecp/crypto/chacha/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= +CFLAGS += $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= obj = chacha.o diff --git a/code/ecp/crypto/compat/Makefile b/code/ecp/crypto/compat/Makefile index 7922366..1a8c2ee 100644 --- a/code/ecp/crypto/compat/Makefile +++ b/code/ecp/crypto/compat/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= +CFLAGS += $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= obj = explicit_bzero.o timingsafe_memcmp.o timingsafe_bcmp.o diff --git a/code/ecp/crypto/curve25519/Makefile b/code/ecp/crypto/curve25519/Makefile index e9c2c1b..85839bb 100644 --- a/code/ecp/crypto/curve25519/Makefile +++ b/code/ecp/crypto/curve25519/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -DED25519 +CFLAGS += $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -DED25519 obj = curve25519.o curve25519-generic.o diff --git a/code/ecp/crypto/poly1305/Makefile b/code/ecp/crypto/poly1305/Makefile index 418e3a5..7645ca4 100644 --- a/code/ecp/crypto/poly1305/Makefile +++ b/code/ecp/crypto/poly1305/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= +CFLAGS += $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= obj = poly1305.o diff --git a/code/ecp/crypto/sha/Makefile b/code/ecp/crypto/sha/Makefile index b775c83..1fc67da 100644 --- a/code/ecp/crypto/sha/Makefile +++ b/code/ecp/crypto/sha/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= +CFLAGS += $(PIC) -I../include -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= obj = sha1dgst.o sha1_one.o sha256.o sha512.o diff --git a/code/ecp/crypto/test/Makefile b/code/ecp/crypto/test/Makefile index ae19e4b..0b5013f 100644 --- a/code/ecp/crypto/test/Makefile +++ b/code/ecp/crypto/test/Makefile @@ -1,6 +1,5 @@ include ../../Makefile.platform -CFLAGS=$(CFLAGS_PL) -I.. -I../include -LDFLAGS=$(LDFLAGS_PL) +CFLAGS += -I.. -I../include dep=../e_chacha20poly1305.o ../curve25519/*.o ../chacha/*.o ../poly1305/*.o ../sha/*.o ../compat/*.o -- cgit v1.2.3