From 31b6ce8bef7235667e71d830cda98d9350912883 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 7 Jul 2015 14:58:27 -0400 Subject: Track library move into sw/ tree. --- sw/Makefile | 8 ++++---- sw/libhal | 2 +- sw/pkcs11 | 2 +- 3 files changed, 6 insertions(+), 6 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 index 94666f4..0ababd7 160000 --- a/sw/libhal +++ b/sw/libhal @@ -1 +1 @@ -Subproject commit 94666f41262c2d8afb14552d0939ccca31e5e9f3 +Subproject commit 0ababd7dc7ab6a080971e669598a862ad23d2fa1 diff --git a/sw/pkcs11 b/sw/pkcs11 index 82e7f38..ece23e9 160000 --- a/sw/pkcs11 +++ b/sw/pkcs11 @@ -1 +1 @@ -Subproject commit 82e7f381181605b1e2f0f3e287e9c51d92e40a49 +Subproject commit ece23e92864fdde7c93d6121ae5d6f306070e3e8 -- cgit v1.2.3