aboutsummaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/Makefile10
m---------sw/libhal0
2 files changed, 3 insertions, 7 deletions
diff --git a/sw/Makefile b/sw/Makefile
index 17a7d9b..090855d 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -35,12 +35,8 @@ export CC := arm-linux-gnueabihf-gcc
export AR := arm-linux-gnueabihf-ar
export OBJCOPY := arm-linux-gnueabihf-objcopy
-# Something is messing up the CFLAGS and LDFLAGS settings to libhal.
-# Using autoconf was probably a mistake, but hack around it for now.
-
all:
cd libtfm; ${MAKE}
- cd libhal; ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm'
cd libhal; ${MAKE}
cd sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi
cd pkcs11; ${MAKE}
@@ -49,6 +45,6 @@ clean distclean:
for d in libtfm libhal sqlite3 pkcs11; do (cd $$d && ${MAKE} $@); done
install: all
- install -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so
- install -D pkcs11/p11util ${DESTDIR}/usr/sbin/p11util
-
+ install -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so
+ install -D pkcs11/p11util ${DESTDIR}/usr/sbin/p11util
+ install -D libhal/utils/eim_peek_poke ${DESTDIR}/usr/sbin/eim_peek_poke
diff --git a/sw/libhal b/sw/libhal
-Subproject e80f25d31235628f2d9cfb410d48bcc83b4487d
+Subproject 48565020c549105baed47ef4fcb7630cccd7ffa