diff options
Diffstat (limited to 'kerberos5/lib')
29 files changed, 38 insertions, 82 deletions
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index d88bb5b1bd7b..dddb4d2dc1a8 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/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index a0c4f1c6255a..911868331f9b 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -3,8 +3,7 @@ LIB= asn1 LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h -LDADD= -lcom_err -lroken -DPADD= ${LIBCOM_ERR} ${LIBROKEN} +LIBADD= com_err roken VERSION_MAP= ${.CURDIR}/version.map SRCS= asn1_err.c \ @@ -112,10 +111,10 @@ ${GEN_KX509}: kx509.asn1 .SUFFIXES: .h .c .x .hx .x.c: - cp -f ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} .hx.h: - cp -f ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} NO_BEFOREBUILD_INCLUDES= diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index a883c7d4d8ae..6116767e45a4 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -2,9 +2,7 @@ LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt -DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBCRYPT} +LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend index 53eaa7a7933b..cddcc4485992 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile.depend +++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend @@ -18,8 +18,8 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ - lib/libcrypt \ lib/libgssapi \ + lib/libthr \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index cfe071677a32..ac546f716642 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -2,8 +2,7 @@ LIB= gssapi_ntlm LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend index a43012612ccf..6faf414b4983 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend +++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend @@ -10,13 +10,13 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libheimntlm \ - kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/libgssapi \ + lib/libthr \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index 09062655d0e1..5e54e95f7e93 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -2,8 +2,7 @@ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined -LDADD= -lgssapi -lheimbase -lasn1 -lroken -DPADD= ${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN} +LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ @@ -46,10 +45,10 @@ ${GEN}: spnego.asn1 spnego.opt .SUFFIXES: .h .c .x .hx .x.c: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} .hx.h: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} .include <bsd.lib.mk> diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index 2492ca126c9a..66e0a67475ff 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -3,8 +3,8 @@ LIB= hdb LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LDADD= -lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD} +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\"" @@ -91,10 +91,10 @@ ${GEN}: hdb.asn1 .SUFFIXES: .h .c .x .hx .x.c: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} .hx.h: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} NO_BEFOREBUILD_INCLUDES= diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend index b4e36db527fa..47b2075cff2f 100644 --- a/kerberos5/lib/libhdb/Makefile.depend +++ b/kerberos5/lib/libhdb/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ include/xlocale \ kerberos5/lib/libasn1 \ kerberos5/lib/libheimbase \ - kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ @@ -19,6 +18,8 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + lib/libsqlite3 \ + lib/libthr \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile index b6a61d0e9e0d..b6bf526b3522 100644 --- a/kerberos5/lib/libheimbase/Makefile +++ b/kerberos5/lib/libheimbase/Makefile @@ -2,7 +2,7 @@ LIB= heimbase LDFLAGS= -Wl,--no-undefined -LDADD= -lpthread +LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map INCS= heimbase.h diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile index 2dca4009c737..9ec712572371 100644 --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -2,8 +2,7 @@ LIB= heimipcc PRIVATELIB= -LDADD= -lheimbase -lroken -lpthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} +LIBADD= heimbase roken pthread SRCS= \ client.c \ diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile index 31fd4afa1a56..b1201f65a842 100644 --- a/kerberos5/lib/libheimipcs/Makefile +++ b/kerberos5/lib/libheimipcs/Makefile @@ -2,9 +2,7 @@ LIB= heimipcs PRIVATELIB= -LDADD= -lheimbase -lroken -LDFLAGS= -pthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} +LIBADD= heimbase roken pthread SRCS= \ server.c \ diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index 2f0415d9b42e..d35fc38accae 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -2,8 +2,7 @@ LIB= heimntlm LDFLAGS= -Wl,--no-undefined -LDADD= -lcrypto -lcom_err -lkrb5 -lroken -DPADD= ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} +LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c INCS= heimntlm.h heimntlm-protos.h ntlm_err.h CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend index 3efab050e19f..ccf7070eb77b 100644 --- a/kerberos5/lib/libheimntlm/Makefile.depend +++ b/kerberos5/lib/libheimntlm/Makefile.depend @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + lib/libthr \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libheimsqlite/Makefile b/kerberos5/lib/libheimsqlite/Makefile deleted file mode 100644 index b98537a3324f..000000000000 --- a/kerberos5/lib/libheimsqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -LIB= heimsqlite -SRCS= sqlite3.c -DPADD= ${LIBPTHREAD} -LDADD= -lpthread -CFLAGS+=-I${KRB5DIR}/lib/sqlite - -.include <bsd.lib.mk> - -.PATH: ${KRB5DIR}/lib/sqlite diff --git a/kerberos5/lib/libheimsqlite/Makefile.depend b/kerberos5/lib/libheimsqlite/Makefile.depend deleted file mode 100644 index 2fe55c2304c6..000000000000 --- a/kerberos5/lib/libheimsqlite/Makefile.depend +++ /dev/null @@ -1,20 +0,0 @@ -# Autogenerated - do NOT edit! - -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - -DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libgcc \ - include \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/libthr \ - usr.bin/xinstall.host \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index dc2be9942137..eaa3beea10b5 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -3,8 +3,7 @@ LIB= hx509 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map -LDADD= -lasn1 -lcom_err -lcrypto -lroken -lwind -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND} +LIBADD= asn1 com_err crypto roken wind MAN= hx509.3 \ hx509_ca.3 \ @@ -286,10 +285,10 @@ ${GEN_CRMF}: crmf.asn1 .SUFFIXES: .h .c .x .hx .x.c: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} .hx.h: - cp ${.IMPSRC} ${.TARGET} + ${CP} ${.IMPSRC} ${.TARGET} NO_BEFOREBUILD_INCLUDES= diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend index c36ae15e2a48..d243220a81db 100644 --- a/kerberos5/lib/libhx509/Makefile.depend +++ b/kerberos5/lib/libhx509/Makefile.depend @@ -17,6 +17,7 @@ DIRDEPS = \ lib/libcompiler_rt \ secure/lib/libcrypto \ usr.bin/xinstall.host \ + usr.bin/yacc.host \ .include <dirdeps.mk> diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile index c413b5d3cac8..1f3401e636d5 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -2,8 +2,7 @@ LIB= kadm5clnt LDFLAGS= -Wl,--no-undefined -LDADD= -lcom_err -lkrb5 -lroken -DPADD= ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} +LIBADD= com_err krb5 roken INCS= admin.h \ kadm5-private.h \ diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend index 8cb61ee781af..cf30e8fd4fe5 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile.depend +++ b/kerberos5/lib/libkadm5clnt/Makefile.depend @@ -16,6 +16,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + lib/libthr \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile index 5c3a1916880c..adf49a5b1af5 100644 --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -2,8 +2,7 @@ LIB= kadm5srv LDFLAGS= -Wl,--no-undefined -LDADD= -lcom_err -lhdb -lkrb5 -lroken -DPADD= ${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} +LIBADD= com_err hdb krb5 roken VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map MAN= kadm5_pwcheck.3 diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend index 48db2a548135..2a559eb51517 100644 --- a/kerberos5/lib/libkadm5srv/Makefile.depend +++ b/kerberos5/lib/libkadm5srv/Makefile.depend @@ -16,6 +16,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ + lib/libthr \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 6d66578cb247..6b7a4cda6d7a 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ LIB= kafs5 -LDADD= -lasn1 -lroken -lkrb5 LDFLAGS= -Wl,--no-undefined -DPADD= ${LIBASN1} ${LIBKRB5} ${LIBROKEN} +LIBADD= asn1 krb5 roken INCS= kafs.h MAN= kafs5.3 VERSION_MAP= ${.CURDIR}/version.map diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend index 3eaa22ab602c..a2e5f8c7b076 100644 --- a/kerberos5/lib/libkafs5/Makefile.depend +++ b/kerberos5/lib/libkafs5/Makefile.depend @@ -14,6 +14,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libthr \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index fa9792da08b6..14b0797e2738 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -3,9 +3,7 @@ LIB= kdc LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/kdc/version-script.map -LDADD= -lroken -lhdb -lhx509 -lkrb5 -lheimntlm -lasn1 -lcrypt -lcrypto -DPADD= ${LIBROKEN} ${LIBHDB} ${LIBHX509} ${LIBKRB5} ${LIBHEIMNTLM} \ - ${LIBASN1} ${LIBCRYPT} ${LIBCRYPTO} +LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto INCS= kdc.h \ kdc-protos.h diff --git a/kerberos5/lib/libkdc/Makefile.depend b/kerberos5/lib/libkdc/Makefile.depend index 14e302a31bea..391591d58b83 100644 --- a/kerberos5/lib/libkdc/Makefile.depend +++ b/kerberos5/lib/libkdc/Makefile.depend @@ -20,7 +20,7 @@ DIRDEPS = \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ - lib/libcrypt \ + lib/libthr \ lib/libutil \ secure/lib/libcrypto \ usr.bin/xinstall.host \ diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 4128762967a5..a1999ccf3e63 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -3,9 +3,7 @@ LIB= krb5 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map -LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC} -DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} -USEPRIVATELIB= heimipcc +LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc INCS= heim_err.h \ heim_threads.h \ diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index cf9368bbf3ee..aade99ae625b 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ LIB= roken -LDADD= -lcrypt -DPADD= ${LIBCRYPT} +LIBADD= crypt VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map INCS= roken.h \ roken-common.h \ diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile index 6d0b9c08e200..a489566efbb3 100644 --- a/kerberos5/lib/libwind/Makefile +++ b/kerberos5/lib/libwind/Makefile @@ -3,8 +3,7 @@ LIB= wind LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map -LDADD= -lcom_err -lroken -DPADD= ${LIBCOM_ERR} ${LIBROKEN} +LIBADD= com_err roken INCS= wind.h \ wind_err.h |