aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-07-07 14:58:27 -0400
committerRob Austein <sra@hactrn.net>2015-07-07 14:58:27 -0400
commit31b6ce8bef7235667e71d830cda98d9350912883 (patch)
tree2bbb9aac83b51cd5a1528694873d4f1c8831f46f
parent1503f72a4756e4da0494a0f957ad5b74f21b3756 (diff)
Track library move into sw/ tree.
-rw-r--r--sw/Makefile8
m---------sw/libhal0
m---------sw/pkcs110
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/Makefile b/sw/Makefile
index da59b70..9e2efaa 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -36,10 +36,10 @@ export AR := arm-linux-gnueabihf-ar
export OBJCOPY := arm-linux-gnueabihf-objcopy
all:
- cd libtfm; ${MAKE}
- cd libhal; ${MAKE}
- cd sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi
- cd pkcs11; ${MAKE}
+ cd thirdparty/sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi
+ cd thirdparty/libtfm; ${MAKE}
+ cd libhal; ${MAKE}
+ cd pkcs11; ${MAKE}
clean distclean:
for d in libtfm libhal sqlite3 pkcs11; do (cd $$d && ${MAKE} $@); done
diff --git a/sw/libhal b/sw/libhal
-Subproject 94666f41262c2d8afb14552d0939ccca31e5e9f
+Subproject 0ababd7dc7ab6a080971e669598a862ad23d2fa
diff --git a/sw/pkcs11 b/sw/pkcs11
-Subproject 82e7f381181605b1e2f0f3e287e9c51d92e40a4
+Subproject ece23e92864fdde7c93d6121ae5d6f306070e3e