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 /tests | |
| parent | 7537c3a6f3c50301f220a0f1500afda904b4a2cf (diff) | |
Simplify makefile to make them easier to use with non-default directory names
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/Makefile b/tests/Makefile index d186000..515c662 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2015, NORDUnet A/S +# Copyright (c) 2015-2018, NORDUnet A/S # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,15 +27,9 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -ifndef CRYPTECH_ROOT - CRYPTECH_ROOT := $(abspath ../../..) -endif - -LIBTFM_SRC ?= ${CRYPTECH_ROOT}/sw/thirdparty/libtfm -LIBTFM_BLD ?= ${LIBTFM_SRC} - -LIBHAL_SRC ?= ${CRYPTECH_ROOT}/sw/libhal +LIBHAL_SRC ?= .. LIBHAL_BLD ?= ${LIBHAL_SRC} +LIBTFM_BLD ?= ../../thirdparty/libtfm LIBS = ${LIBHAL_BLD}/libhal.a ${LIBTFM_BLD}/libtfm.a @@ -63,8 +57,6 @@ else endif -$(info Building libhal with configuration IO_BUS=${IO_BUS} RPC_MODE=${RPC_MODE} KS=${KS} RPC_TRANSPORT=${RPC_TRANSPORT} MODEXP_CORE=${MODEXP_CORE}) - all: ${BIN} test: all @@ -76,7 +68,7 @@ clean distclean: ${BIN}: %: %.o ${LIBS} ${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS} -%.o: %.c ${LBHAL_SRC}/*.h ${LIBTFM_BLD}/tfm.h +%.o: %.c ${LIBHAL_SRC}/*.h ${LIBTFM_BLD}/tfm.h ${CC} ${CFLAGS} -c -o $@ $< test-rpc_hashsig.o: test-hashsig.h |