From 3f25e1bf5509f584f455e0e3ce369bc51b763f85 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 5 Jul 2015 18:27:24 -0400
Subject: Install eim_peek_poke.  Track removal of autoconf from libhal.

---
 sw/Makefile | 10 +++-------
 sw/libhal   |  2 +-
 2 files changed, 4 insertions(+), 8 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
index e80f25d..4856502 160000
--- a/sw/libhal
+++ b/sw/libhal
@@ -1 +1 @@
-Subproject commit e80f25d31235628f2d9cfb410d48bcc83b4487d5
+Subproject commit 48565020c549105baed47ef4fcb7630cccd7ffa1
-- 
cgit v1.2.3