From a6e4734a188460d3dff46e551eb75c276e3fafc3 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 27 Jun 2016 20:59:39 -0400
Subject: Mostly working.  A few scripts still missing from binary packages,
 and no Homebrew yet.

---
 source/Makefile  | 29 +++++++++++++++++------------
 source/sw/pkcs11 |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'source')

diff --git a/source/Makefile b/source/Makefile
index e2fdb1b..18462a8 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,19 +1,24 @@
-# Makefile to build Debian package for Cryptech Alpha board software
+# Source package makefile for Cryptech Alpha board software.
+#
+# This is, deliberately, a very simplified Makefile.  for the most
+# part we just want to do the bare minimum needed for whatever
+# software packaging system we use to work.  At least for the moment,
+# the primary packaging system is Debian-based, so this is written
+# to work in that environment.  At some point we'll probably add
+# Homebrew support for Mac OS X.
+
 
 all:
-	cd sw/thirdparty/libtfm;  ${MAKE}
-	cd sw/libhal; ${MAKE} daemon
-	cd sw/pkcs11; ${MAKE}
+	${MAKE} -C sw/pkcs11
 
 clean distclean:
-	cd sw/thirdparty/libtfm;  ${MAKE} $@
-	cd sw/libhal; ${MAKE} $@
-	cd sw/pkcs11; ${MAKE} $@
+	${MAKE} -C sw/pkcs11 $@
 
 install: all
-	install -m 644 -D sw/pkcs11/libpkcs11.so	${DESTDIR}/usr/lib/libpkcs11.so
-	install -D sw/pkcs11/p11util			${DESTDIR}/usr/sbin/p11util
-	install -D sw/libhal/cryptech_rpcd		${DESTDIR}/usr/sbin/cryptech_rpcd
-	ln -s libpkcs11.so				${DESTDIR}/usr/lib/libpkcs11.so.0
+	install -D -m 644 cryptech-alpha-firmware.tar.gz	${DESTDIR}/usr/share/cryptech-alpha-firmware.tar.gz
+	install -D -m 644 sw/pkcs11/libpkcs11.so		${DESTDIR}/usr/lib/libpkcs11.so
+	install -D	  sw/pkcs11/p11util			${DESTDIR}/usr/sbin/p11util
+	install -D	  sw/pkcs11/libhal/cryptech_rpcd	${DESTDIR}/usr/sbin/cryptech_rpcd
+	ln	-s	  libpkcs11.so				${DESTDIR}/usr/lib/libpkcs11.so.0
 
-# Might also want to install the firmware tarball, scripts to use it, ....
+# Still need scripts to do something useful with the firmware tarball
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
index 3118c13..f13948e 160000
--- a/source/sw/pkcs11
+++ b/source/sw/pkcs11
@@ -1 +1 @@
-Subproject commit 3118c1384c46140269033ea63faa6ebca9a3af5a
+Subproject commit f13948ea98afb9cb1e8ea0f7a15554621c1fe08a
-- 
cgit v1.2.3