diff options
| author | Paul Selkirk <paul@psgd.org> | 2018-08-12 15:21:46 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2018-08-12 15:21:46 -0400 |
| commit | dfc25221fb6fa12d4523caf5aeaf400057e0ab7e (patch) | |
| tree | ce638cc9f3bcc61522fd146777ff12745cc0f0cd /Makefile | |
| parent | 7537c3a6f3c50301f220a0f1500afda904b4a2cf (diff) | |
Simplify makefile to make them easier to use with non-default directory names
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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 |