aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-06-26 13:07:40 -0400
committerRob Austein <sra@hactrn.net>2016-06-26 13:07:40 -0400
commit856cb22d530e820c122e0dbee5b61edff91d235e (patch)
tree0b07d598675e794d6f898574640f87290d7d370e
parente21726fd47adaf461a9434acf8422a865f53f78b (diff)
Fix distclean target and drag in change to disable libtfm assembly code.
-rw-r--r--source/Makefile4
m---------source/sw/pkcs110
2 files changed, 3 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile
index 7b44136..e2fdb1b 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -6,7 +6,9 @@ all:
cd sw/pkcs11; ${MAKE}
clean distclean:
- for d in thirdparty/libtfm libhal pkcs11; do (cd $$d && ${MAKE} $@); done
+ cd sw/thirdparty/libtfm; ${MAKE} $@
+ cd sw/libhal; ${MAKE} $@
+ cd sw/pkcs11; ${MAKE} $@
install: all
install -m 644 -D sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject 6c7ea9977c45116cc51aba7a4486059926d0111
+Subproject 3118c1384c46140269033ea63faa6ebca9a3af5