Remove SQLite3 from build, no longer needed.

1 files changed, 3 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 9d72087..86a8c57 100644
--- a/Makefile
+++ b/Makefile
@@ -44,10 +44,6 @@ LIBHAL_BLD	?= ${PKCS11_DIR}/libhal
 LIBTFM_SRC	?= ${CRYPTECH_ROOT}/sw/thirdparty/libtfm
 LIBTFM_BLD	?= ${PKCS11_DIR}/libtfm
 
-SQLITE3_SRC	?= ${CRYPTECH_ROOT}/sw/thirdparty/sqlite3
-SQLITE3_BLD	?= ${PKCS11_DIR}/sqlite3
-
-
 # Whether to enable threading.  Main reason for being able to turn it
 # off is that gdb on the Novena (sometimes) goes bananas when
 # threading is enabled.
@@ -65,10 +61,6 @@ ENABLE_DEBUGGING ?= no
 
 ENABLE_FOOTNOTE_WARNINGS ?= yes
 
-# Whether to build and use our own copy of the sqlite3 library.
-
-ENABLE_OWN_SQLITE_LIBRARY ?= $(if $(wildcard ${CRYPTECH_ROOT}/sw/thirdparty/sqlite3),yes,no)
-
 # Target platform for shared library.  Every platform has its own
 # kinks, as does GNU libtool, so we just suck it up and do the
 # necessary kinks for the platforms we support.  Yuck.
@@ -118,13 +110,6 @@ ifeq "${ENABLE_DEBUGGING}" "yes"
   CFLAGS += -DDEBUG_HAL=1 -DDEBUG_PKCS11=1
 endif
 
-ifeq "${ENABLE_OWN_SQLITE_LIBRARY}" "yes"
-  CFLAGS  += -I${SQLITE3_BLD}
-  SOFLAGS += ${SQLITE3_BLD}/libsqlite3.a
-else
-  SOFLAGS += -lsqlite3
-endif
-
 ifndef OBJCOPY
   OBJCOPY := objcopy
 endif
@@ -132,12 +117,9 @@ endif
 all: ${SONAME} p11util py11/attribute_map.py
 
 clean:
-	rm -rf *.o ${SONAME}* p11util schema.h attributes.h py11/*.pyc
+	rm -rf *.o ${SONAME}* p11util attributes.h py11/*.pyc
 	${MAKE} -C libtfm  $@
 	${MAKE} -C libhal  $@
-ifeq "${ENABLE_OWN_SQLITE_LIBRARY}" "yes"
-	${MAKE} -C sqlite3 $@
-endif
 
 distclean: clean
 	rm -f TAGS
@@ -150,25 +132,15 @@ ${LIBTFM_BLD}/libtfm.a: .FORCE
 ${LIBHAL_BLD}/libhal.a: .FORCE ${LIBTFM_BLD}/libtfm.a
 	${MAKE} -C libhal ${LIBHAL_TARGET}
 
-${SQLITE3_BLD}/libsqlite3.a: .FORCE
-	${MAKE} -C sqlite3
-
-schema.h: schema.sql scripts/convert-schema.sed Makefile
-	sed -f scripts/convert-schema.sed <schema.sql >schema.h
-
 attributes.h: attributes.yaml scripts/build-attributes Makefile
 	python scripts/build-attributes attributes.yaml attributes.h
 
 py11/attribute_map.py: attributes.yaml scripts/build-py11-attributes Makefile
 	python scripts/build-py11-attributes attributes.yaml py11/attribute_map.py
 
-pkcs11.o: pkcs11.c schema.h attributes.h ${LIBS}
+pkcs11.o: pkcs11.c attributes.h ${LIBS}
 	${CC} ${CFLAGS} -c $<
 
-ifeq "${ENABLE_OWN_SQLITE_LIBRARY}" "yes"
-  pkcs11.o: ${SQLITE3_BLD}/libsqlite3.a
-endif
-
 ifeq "${UNAME}" "Darwin"
 
   ${SONAME}: pkcs11.o ${LIBS}
@@ -183,7 +155,7 @@ else
 
 endif
 
-p11util.o: p11util.c schema.h
+p11util.o: p11util.c
 	${CC} ${CFLAGS} -c $<
 
 p11util: p11util.o ${LIBS}