[Cryptech-Commits] [sw/pkcs11] 20/20: Track move of third party libraries to /sw/thirdparty/.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository sw/pkcs11.

commit ece23e92864fdde7c93d6121ae5d6f306070e3e8
Author: Rob Austein <sra at hactrn.net>
Date:   Tue Jul 7 14:03:17 2015 -0400

    Track move of third party libraries to /sw/thirdparty/.
---
 GNUmakefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index da612e7..aa95233 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -36,10 +36,11 @@ ifndef ENABLE_THREADS
 endif
 
 LIBHAL_DIR   = ../libhal
-LIBTFM_DIR   = ../libtfm
-SQLITE3_DIR  = ../sqlite3
+LIBTFM_DIR   = ../thirdparty/libtfm
+SQLITE3_DIR  = ../thirdparty/sqlite3
 
-CFLAGS	+= -g3 -fPIC -Wall -std=c99 -I${LIBHAL_DIR} -I${SQLITE3_DIR}
+CFLAGS	:= -g3 -fPIC -Wall -std=c99 -I${LIBHAL_DIR} -I${SQLITE3_DIR}
+SOFLAGS := -Wl,-Bsymbolic-functions -Wl,-Bsymbolic -Wl,-z,noexecstack
 LIBS	:= ${LIBHAL_DIR}/libhal.a ${LIBTFM_DIR}/libtfm.a ${SQLITE3_DIR}/libsqlite3.a
 
 ifeq "${ENABLE_THREADS}" "yes"
@@ -70,7 +71,7 @@ pkcs11.o: pkcs11.c sql_common.h schema.h attributes.h
 	${CC} ${CFLAGS} -c $<
 
 pkcs11.so: pkcs11.o ${LIBS}
-	${CC} ${CFLAGS} -shared -o $@ -Wl,-Bsymbolic-functions -Wl,-Bsymbolic -Wl,-z,noexecstack -g $^
+	${CC} ${CFLAGS} -shared -o $@ ${SOFLAGS} $^
 
 libpkcs11.so: pkcs11.so
 	${OBJCOPY} -w -G 'C_*' $< $@
@@ -79,7 +80,7 @@ p11util.o: p11util.c sql_common.h schema.h
 	${CC} ${CFLAGS} -c $<
 
 p11util: p11util.o ${LIBS}
-	${CC} ${CFLAGS} -o $@ -g $^
+	${CC} ${CFLAGS} -o $@ $^
 
 tags: TAGS