diff options
author | Fredrik Thulin <fredrik@thulin.net> | 2016-07-09 20:26:57 +0200 |
---|---|---|
committer | Fredrik Thulin <fredrik@thulin.net> | 2016-07-09 20:26:57 +0200 |
commit | dcc6cf1b97935bc3a663714f596cacba619a8b3d (patch) | |
tree | c38a88e9ae4a1e012cf2cceb2da3c9c10d2bb27a /libraries/libhal | |
parent | 3ea10bf4fba185a8bfbb33a8c67a69f70b95755a (diff) | |
parent | df9e82b28aad97664cba1fc238bc4f2563c1de7c (diff) |
Merge branch 'master' of git.cryptech.is.:sw/stm32
Diffstat (limited to 'libraries/libhal')
-rw-r--r-- | libraries/libhal/Makefile | 12 | ||||
-rw-r--r-- | libraries/libhal/tests/Makefile | 12 | ||||
-rw-r--r-- | libraries/libhal/utils/Makefile | 12 |
3 files changed, 9 insertions, 27 deletions
diff --git a/libraries/libhal/Makefile b/libraries/libhal/Makefile index fbc3473..bf870b9 100644 --- a/libraries/libhal/Makefile +++ b/libraries/libhal/Makefile @@ -1,10 +1,4 @@ -ifndef CRYPTECH_ROOT - CRYPTECH_ROOT := $(abspath ../../../..) -endif +vpath %.c ${LIBHAL_SRC} +vpath %.h ${LIBHAL_SRC} -REPO := ${CRYPTECH_ROOT}/sw/libhal - -vpath %.c ${REPO} -vpath %.h ${REPO} - -include ${REPO}/Makefile +include ${LIBHAL_SRC}/Makefile diff --git a/libraries/libhal/tests/Makefile b/libraries/libhal/tests/Makefile index 7553427..e148174 100644 --- a/libraries/libhal/tests/Makefile +++ b/libraries/libhal/tests/Makefile @@ -1,10 +1,4 @@ -ifndef CRYPTECH_ROOT - CRYPTECH_ROOT := $(abspath ../../../../..) -endif +vpath %.c ${LIBHAL_SRC}/tests +vpath %.h ${LIBHAL_SRC}/tests -REPO := ${CRYPTECH_ROOT}/sw/libhal - -vpath %.c ${REPO}/tests -vpath %.h ${REPO}/tests - -include ${REPO}/tests/Makefile +include ${LIBHAL_SRC}/tests/Makefile diff --git a/libraries/libhal/utils/Makefile b/libraries/libhal/utils/Makefile index 43fbe0d..6f21c2f 100644 --- a/libraries/libhal/utils/Makefile +++ b/libraries/libhal/utils/Makefile @@ -1,10 +1,4 @@ -ifndef CRYPTECH_ROOT - CRYPTECH_ROOT := $(abspath ../../../../..) -endif +vpath %.c ${LIBHAL_SRC}/utils +vpath %.h ${LIBHAL_SRC}/utils -REPO := ${CRYPTECH_ROOT}/sw/libhal - -vpath %.c ${REPO}/utils -vpath %.h ${REPO}/utils - -include ${REPO}/utils/Makefile +include ${LIBHAL_SRC}/utils/Makefile |