build sys fix

15 files changed, 16 insertions, 19 deletions

diff --git a/code/ecp/Makefile b/code/ecp/Makefile
index a62e6f0..972f8d7 100644
--- a/code/ecp/Makefile
+++ b/code/ecp/Makefile
@@ -1,5 +1,5 @@
 include Makefile.platform
-CFLAGS=$(CFLAGS_PL) $(PIC) -I.
+CFLAGS += $(PIC) -I.
 
 obj = core.o timer.o $(obj_rbuf)
 subdirs = crypto platform $(htable) $(vconn)
diff --git a/code/ecp/Makefile.fe310 b/code/ecp/Makefile.fe310
index 7a13137..23938a8 100644
--- a/code/ecp/Makefile.fe310
+++ b/code/ecp/Makefile.fe310
@@ -9,5 +9,4 @@ FE310_HOME = /opt/my/freedom-e-sdk
 CC = $(FE310_HOME)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-gcc
 AR = $(FE310_HOME)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-ar
 
-CFLAGS_PL = -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -O3 -fno-builtin-printf -march=rv32imac -mabi=ilp32 -mcmodel=medany -I$(FE310_HOME)/bsp/include -I$(FE310_HOME)/bsp/drivers -I$(FE310_HOME)/bsp/env -I$(FE310_HOME)/bsp/env/freedom-e300-hifive1 -I../fe310 -I../../fe310
-# LDFLAGS_PL=-lm -pthread
\ No newline at end of file
+CFLAGS = -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -O3 -fno-builtin-printf -march=rv32imac -mabi=ilp32 -mcmodel=medany -I$(FE310_HOME)/bsp/include -I$(FE310_HOME)/bsp/drivers -I$(FE310_HOME)/bsp/env -I$(FE310_HOME)/bsp/env/freedom-e300-hifive1 -I../fe310 -I../../fe310
diff --git a/code/ecp/Makefile.posix b/code/ecp/Makefile.posix
index 2822792..aed4d67 100644
--- a/code/ecp/Makefile.posix
+++ b/code/ecp/Makefile.posix
@@ -4,6 +4,5 @@ htable=htable
 vconn=vconn
 obj_rbuf=rbuf.o rbuf_send.o rbuf_recv.o msgq.o
 
-CFLAGS_PL=-O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_DEBUG=1
-
-LDFLAGS_PL=-lm -pthread
\ No newline at end of file
+CFLAGS = -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_DEBUG=1
+LDFLAGS = -lm -pthread
\ No newline at end of file
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
 
diff --git a/code/ecp/fe310/Makefile b/code/ecp/fe310/Makefile
index 66663f0..c781824 100644
--- a/code/ecp/fe310/Makefile
+++ b/code/ecp/fe310/Makefile
@@ -1,5 +1,5 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) $(PIC) -I..
+CFLAGS += $(PIC) -I..
 
 obj_tr = transport.o
 obj_tm = time.o
diff --git a/code/ecp/htable/Makefile b/code/ecp/htable/Makefile
index 6f5b888..7ef95d5 100644
--- a/code/ecp/htable/Makefile
+++ b/code/ecp/htable/Makefile
@@ -1,5 +1,5 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) $(PIC) -I.. -std=gnu89 
+CFLAGS += $(PIC) -I.. -std=gnu89
 
 obj = htable.o hashtable.o hashtable_itr.o
 
diff --git a/code/ecp/posix/Makefile b/code/ecp/posix/Makefile
index 66663f0..c781824 100644
--- a/code/ecp/posix/Makefile
+++ b/code/ecp/posix/Makefile
@@ -1,5 +1,5 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) $(PIC) -I..
+CFLAGS += $(PIC) -I..
 
 obj_tr = transport.o
 obj_tm = time.o
diff --git a/code/ecp/vconn/Makefile b/code/ecp/vconn/Makefile
index d9d2e6f..9d11406 100644
--- a/code/ecp/vconn/Makefile
+++ b/code/ecp/vconn/Makefile
@@ -1,5 +1,5 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) $(PIC) -I..
+CFLAGS += $(PIC) -I..
 
 obj = vconn.o