From cd846d601227db0047c35b551858d62d6b794127 Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Wed, 2 Feb 2022 06:21:09 +0100
Subject: fixed new crypto

---
 ecp/src/crypto/Makefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'ecp/src/crypto/Makefile')

diff --git a/ecp/src/crypto/Makefile b/ecp/src/crypto/Makefile
index cbbc60f..b1d2996 100644
--- a/ecp/src/crypto/Makefile
+++ b/ecp/src/crypto/Makefile
@@ -1,14 +1,12 @@
-include ../Makefile.platform
-CFLAGS += $(PIC) -Iinclude -I.. -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=
+include ../common.mk
+ssl_dir = ../../../ext/libressl
+CFLAGS += -I$(ssl_dir)/include
+MAKEFLAGS += -I$(pwd)/..
 
-obj = crypto.o e_chacha20poly1305.o
-obj_dep = compat/explicit_bzero.o compat/timingsafe_memcmp.o compat/timingsafe_bcmp.o \
-	chacha/chacha.o poly1305/poly1305.o \
-	curve25519/curve25519.o curve25519/curve25519-generic.o \
-	sha/sha256.o sha/sha512.o \
-	arc4random/arc4random.o
-
-subdirs = compat curve25519 chacha poly1305 sha arc4random
+include $(ssl_dir)/ssl_obj.mk
+obj = crypto.o
+obj_ssl = $(addprefix $(ssl_dir)/,$(obj_dep))
+subdirs = $(ssl_dir)
 
 
 %.o: %.c
@@ -18,10 +16,10 @@ all: $(obj)
 	for i in $(subdirs); do \
 		(cd $$i && $(MAKE)) || exit; \
 	done
-	$(AR) rcs libecpcr.a $(obj) $(obj_dep)
+	$(AR) rcs libecpcr.a $(obj) $(obj_ssl)
 
 clean:
-	for i in $(subdirs) test; do \
+	for i in $(subdirs); do \
 		(cd $$i && $(MAKE) clean) || exit; \
 	done
 	rm -f *.o *.a
-- 
cgit v1.2.3