From de6d17659a4308b2313e633b0bf5f62946bbd741 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 5 Jul 2015 00:47:00 -0400
Subject: Rearrange tree to make filenames in source packages come out right.

---
 sw/Makefile   | 16 ++++++++--------
 sw/libhal     |  1 +
 sw/libtfm     |  1 +
 sw/pkcs11     |  1 +
 sw/sqlite3    |  1 +
 sw/sw/libhal  |  1 -
 sw/sw/libtfm  |  1 -
 sw/sw/pkcs11  |  1 -
 sw/sw/sqlite3 |  1 -
 9 files changed, 12 insertions(+), 12 deletions(-)
 create mode 160000 sw/libhal
 create mode 160000 sw/libtfm
 create mode 160000 sw/pkcs11
 create mode 160000 sw/sqlite3
 delete mode 160000 sw/sw/libhal
 delete mode 160000 sw/sw/libtfm
 delete mode 160000 sw/sw/pkcs11
 delete mode 160000 sw/sw/sqlite3

(limited to 'sw')

diff --git a/sw/Makefile b/sw/Makefile
index 9dd7dc9..17a7d9b 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -39,16 +39,16 @@ export OBJCOPY	:= arm-linux-gnueabihf-objcopy
 # Using autoconf was probably a mistake, but hack around it for now.
 
 all:
-	cd sw/libtfm;  ${MAKE}
-	cd sw/libhal;  ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm'
-	cd sw/libhal;  ${MAKE}
-	cd sw/sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi
-	cd sw/pkcs11;  ${MAKE}
+	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}
 
 clean distclean:
-	for d in libtfm libhal sqlite3 pkcs11; do (cd sw/$$d && ${MAKE} $@); done
+	for d in libtfm libhal sqlite3 pkcs11; do (cd $$d && ${MAKE} $@); done
 
 install: all
-	install -D sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so
-	install -D sw/pkcs11/p11util      ${DESTDIR}/usr/sbin/p11util
+	install -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so
+	install -D pkcs11/p11util      ${DESTDIR}/usr/sbin/p11util
 
diff --git a/sw/libhal b/sw/libhal
new file mode 160000
index 0000000..e80f25d
--- /dev/null
+++ b/sw/libhal
@@ -0,0 +1 @@
+Subproject commit e80f25d31235628f2d9cfb410d48bcc83b4487d5
diff --git a/sw/libtfm b/sw/libtfm
new file mode 160000
index 0000000..108e789
--- /dev/null
+++ b/sw/libtfm
@@ -0,0 +1 @@
+Subproject commit 108e78987bc39f11d0abbba7dbfe80704cbf0282
diff --git a/sw/pkcs11 b/sw/pkcs11
new file mode 160000
index 0000000..5f0d1c2
--- /dev/null
+++ b/sw/pkcs11
@@ -0,0 +1 @@
+Subproject commit 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe241
diff --git a/sw/sqlite3 b/sw/sqlite3
new file mode 160000
index 0000000..7bdeab3
--- /dev/null
+++ b/sw/sqlite3
@@ -0,0 +1 @@
+Subproject commit 7bdeab315c5fdaf6d1b087423b98e80e80fefec8
diff --git a/sw/sw/libhal b/sw/sw/libhal
deleted file mode 160000
index e80f25d..0000000
--- a/sw/sw/libhal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e80f25d31235628f2d9cfb410d48bcc83b4487d5
diff --git a/sw/sw/libtfm b/sw/sw/libtfm
deleted file mode 160000
index 108e789..0000000
--- a/sw/sw/libtfm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 108e78987bc39f11d0abbba7dbfe80704cbf0282
diff --git a/sw/sw/pkcs11 b/sw/sw/pkcs11
deleted file mode 160000
index 5f0d1c2..0000000
--- a/sw/sw/pkcs11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe241
diff --git a/sw/sw/sqlite3 b/sw/sw/sqlite3
deleted file mode 160000
index 7bdeab3..0000000
--- a/sw/sw/sqlite3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7bdeab315c5fdaf6d1b087423b98e80e80fefec8
-- 
cgit v1.2.3