From f13948ea98afb9cb1e8ea0f7a15554621c1fe08a Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 27 Jun 2016 20:32:41 -0400
Subject: Apparently sw/pkcs11 somehow missed the great ${foo_LIB} =>
 ${foo_SRC}, ${foo_BLD} Makefile cleanup.

---
 libhal/utils/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'libhal/utils/Makefile')

diff --git a/libhal/utils/Makefile b/libhal/utils/Makefile
index b15a0c5..1b8b5a2 100644
--- a/libhal/utils/Makefile
+++ b/libhal/utils/Makefile
@@ -2,9 +2,13 @@ ifndef CRYPTECH_ROOT
   CRYPTECH_ROOT := $(abspath ../../../..)
 endif
 
-TFMDIR := $(abspath ../../libtfm)
+LIBHAL_SRC	?= ${CRYPTECH_ROOT}/sw/libhal
+LIBHAL_BLD	?= $(abspath ..)
 
-vpath %.c ${CRYPTECH_ROOT}/sw/libhal/utils
-vpath %.h ${CRYPTECH_ROOT}/sw/libhal/utils:${LIBTFM_DIR}
+LIBTFM_SRC	?= ${CRYPTECH_ROOT}/sw/thirdparty/libtfm
+LIBTFM_BLD	?= $(abspath ../../libtfm)
 
-include ${CRYPTECH_ROOT}/sw/libhal/utils/Makefile
+vpath %.c ${LIBHAL_SRC}/utils
+vpath %.h ${LIBHAL_SRC}/utils:${LIBTFM_BLD}
+
+include ${LIBHAL_SRC}/utils/Makefile
-- 
cgit v1.2.3