diff options
| author | Rob Austein <sra@hactrn.net> | 2015-07-05 00:47:00 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-07-05 00:47:00 -0400 |
| commit | de6d17659a4308b2313e633b0bf5f62946bbd741 (patch) | |
| tree | 32c2500cf2967f05a5d482494a5847a926592d1e /sw | |
| parent | 3101c2147524d485c505a0710d38ca19655a7016 (diff) | |
Rearrange tree to make filenames in source packages come out right.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Makefile | 16 | ||||
| m--------- | sw/libhal (renamed from sw/sw/libhal) | 0 | ||||
| m--------- | sw/libtfm (renamed from sw/sw/libtfm) | 0 | ||||
| m--------- | sw/pkcs11 (renamed from sw/sw/pkcs11) | 0 | ||||
| m--------- | sw/sqlite3 (renamed from sw/sw/sqlite3) | 0 |
5 files changed, 8 insertions, 8 deletions
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/sw/libhal b/sw/libhal -Subproject e80f25d31235628f2d9cfb410d48bcc83b4487d +Subproject e80f25d31235628f2d9cfb410d48bcc83b4487d diff --git a/sw/sw/libtfm b/sw/libtfm -Subproject 108e78987bc39f11d0abbba7dbfe80704cbf028 +Subproject 108e78987bc39f11d0abbba7dbfe80704cbf028 diff --git a/sw/sw/pkcs11 b/sw/pkcs11 -Subproject 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe24 +Subproject 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe24 diff --git a/sw/sw/sqlite3 b/sw/sqlite3 -Subproject 7bdeab315c5fdaf6d1b087423b98e80e80fefec +Subproject 7bdeab315c5fdaf6d1b087423b98e80e80fefec |