diff options
| author | Rob Austein <sra@hactrn.net> | 2016-06-26 10:26:52 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-06-26 10:26:52 -0400 |
| commit | 64e5fe8edec2c4ba461e712d6fbd05d47d5a9192 (patch) | |
| tree | 5aea327aeab4c5946d286b965cc53bfe3edef6f7 /tests | |
| parent | 2cd3b6fabe5e32f169257caf5532b2bf9c83f803 (diff) | |
Update libhal makefiles to use new LIBxxx_SRC / LIBxxx_BLD scheme so libhal can find tfm.h again.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/Makefile b/tests/Makefile index 50d0ad5..229ffcf 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -27,8 +27,19 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -INC ?= ../hal.h -LIB ?= ../libhal.a +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_BLD ?= ${LIBHAL_SRC} + +LIBS = ${LIBHAL_BLD}/libhal.a ${LIBTFM_BLD}/libtfm.a + +CFLAGS ?= -g3 -Wall -fPIC -std=c99 -I${LIBHAL_SRC} -I${LIBTFM_BLD} # Which tests to build depends on how the library was compiled. @@ -52,8 +63,6 @@ else endif -CFLAGS ?= -g3 -Wall -fPIC -std=c99 -I.. - all: ${BIN} test: all @@ -62,8 +71,8 @@ test: all clean distclean: rm -f *.o ${ALL_TESTS} -${BIN}: %: %.o ${LIB} +${BIN}: %: %.o ${LIBS} ${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS} -%.o: %.c ${INC} +%.o: %.c ${LBHAL_SRC}/*.h ${LIBTFM_BLD}/tfm.h ${CC} ${CFLAGS} -c -o $@ $< |