diff options
| author | bapt <bapt@FreeBSD.org> | 2015-05-20 18:56:29 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-05-20 18:56:29 +0000 |
| commit | 4baf3c11e2a915aba756f2f0aeacab394bbfae46 (patch) | |
| tree | 0f76f73617bf431a80da10112da108b12bf734b7 /kerberos5 | |
| parent | 4a62f9d9f7598e5cadce4fe11ac0758943ef5059 (diff) | |
| download | FreeBSD-src-4baf3c11e2a915aba756f2f0aeacab394bbfae46.zip FreeBSD-src-4baf3c11e2a915aba756f2f0aeacab394bbfae46.tar.gz | |
Make kerberos use the same sqlite libraries as other sqlite consumer.
This reduces the number of copy of sqlite we have to just one and easier
tracking version of sqlite
Differential Revision: https://reviews.freebsd.org/D2443
Reviewed by: imp, stas, bjk
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/lib/Makefile | 2 | ||||
| -rw-r--r-- | kerberos5/lib/libhdb/Makefile | 4 | ||||
| -rw-r--r-- | kerberos5/lib/libheimsqlite/Makefile | 10 |
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 |
