From dfc25221fb6fa12d4523caf5aeaf400057e0ab7e Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Sun, 12 Aug 2018 15:21:46 -0400
Subject: Simplify makefile to make them easier to use with non-default
 directory names

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6934f95..64391be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, NORDUnet A/S
+# Copyright (c) 2015-2018, NORDUnet A/S
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -207,6 +207,8 @@ ifndef CRYPTECH_ROOT
   CRYPTECH_ROOT := $(abspath ../..)
 endif
 
+LIBHAL_SRC	?= ${CRYPTECH_ROOT}/sw/libhal
+LIBHAL_BLD	?= ${LIBHAL_SRC}
 LIBTFM_SRC	?= ${CRYPTECH_ROOT}/sw/thirdparty/libtfm
 LIBTFM_BLD	?= ${LIBTFM_SRC}
 
@@ -221,7 +223,7 @@ CFLAGS		+= -DHAL_STATIC_HASH_STATE_BLOCKS=${STATIC_HASH_STATE_BLOCKS}
 CFLAGS		+= -DHAL_STATIC_HMAC_STATE_BLOCKS=${STATIC_HMAC_STATE_BLOCKS}
 CFLAGS		+= -DHAL_STATIC_PKEY_STATE_BLOCKS=${STATIC_PKEY_STATE_BLOCKS}
 CFLAGS		+= -DHAL_STATIC_KS_VOLATILE_SLOTS=${STATIC_KS_VOLATILE_SLOTS}
-CFLAGS		+= -I${CRYPTECH_ROOT}/sw/libhal
+CFLAGS		+= -I${LIBHAL_SRC}
 CFLAGS		+= -I${LIBTFM_BLD}
 
 # Enable software hash cores everywhere for now.  In theory, there might be situations
@@ -239,6 +241,7 @@ CFLAGS		+= -DHAL_ENABLE_SOFTWARE_HASH_CORES=1
 #export CFLAGS
 
 export RPC_MODE
+export LIBHAL_SRC LIBHAL_BLD LIBTFM_BLD
 
 all: ${LIB}
 	${MAKE} -C tests $@ CFLAGS='${CFLAGS}'
@@ -283,8 +286,8 @@ test: all
 
 clean:
 	rm -f *.o ${LIB}
-	${MAKE} -C tests $@ CFLAGS='${CFLAGS}'
-	${MAKE} -C utils $@ CFLAGS='${CFLAGS}'
+	${MAKE} -C tests $@
+	${MAKE} -C utils $@
 
 distclean: clean
 	rm -f TAGS
-- 
cgit v1.2.3