summaryrefslogtreecommitdiffstats
path: root/kerberos5
diff options
context:
space:
mode:
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/lib/Makefile2
-rw-r--r--kerberos5/lib/libhdb/Makefile4
-rw-r--r--kerberos5/lib/libheimsqlite/Makefile10
3 files changed, 3 insertions, 13 deletions
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index d88bb5b..dddb4d2 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -3,7 +3,7 @@
SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
- libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs
+ libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs
SUBDIR+= libkafs5 # requires krb_err.h from libkrb5
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 2b178b2..7781e63 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -3,7 +3,7 @@
LIB= hdb
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
-LIBADD= asn1 com_err krb5 roken heimsqlite
+LIBADD= asn1 com_err krb5 roken sqlite3
DPADD= ${LDAPDPADD}
MAN= HDB.3 hdb_entry_ex.3
@@ -56,7 +56,7 @@ SRCS= common.c \
${GEN:S/.x$/.c/:S/.hx$/.h/}
CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \
+ -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \
-I${KRB5DIR}/lib/krb5 \
-I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
diff --git a/kerberos5/lib/libheimsqlite/Makefile b/kerberos5/lib/libheimsqlite/Makefile
deleted file mode 100644
index 8cad7e7..0000000
--- a/kerberos5/lib/libheimsqlite/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-LIB= heimsqlite
-SRCS= sqlite3.c
-LIBADD= pthread
-CFLAGS+=-I${KRB5DIR}/lib/sqlite
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/sqlite
OpenPOWER on IntegriCloud