Date: Tue, 25 Nov 2014 09:57:43 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275022 - in head/kerberos5: . lib/libasn1 lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libheimbase lib/libheimipcc lib/libheimipcs lib/libheimntlm lib/libh... Message-ID: <201411250957.sAP9vhlG058729@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 25 09:57:42 2014 New Revision: 275022 URL: https://svnweb.freebsd.org/changeset/base/275022 Log: Convert kerberos to LIBADD and reduce overlinking of the kerberos binaries and libraries Modified: head/kerberos5/Makefile.inc head/kerberos5/lib/libasn1/Makefile head/kerberos5/lib/libgssapi_krb5/Makefile head/kerberos5/lib/libgssapi_ntlm/Makefile head/kerberos5/lib/libgssapi_spnego/Makefile head/kerberos5/lib/libhdb/Makefile head/kerberos5/lib/libheimbase/Makefile head/kerberos5/lib/libheimipcc/Makefile head/kerberos5/lib/libheimipcs/Makefile head/kerberos5/lib/libheimntlm/Makefile head/kerberos5/lib/libheimsqlite/Makefile head/kerberos5/lib/libhx509/Makefile head/kerberos5/lib/libkadm5clnt/Makefile head/kerberos5/lib/libkadm5srv/Makefile head/kerberos5/lib/libkafs5/Makefile head/kerberos5/lib/libkdc/Makefile head/kerberos5/lib/libkrb5/Makefile head/kerberos5/lib/libroken/Makefile head/kerberos5/lib/libwind/Makefile head/kerberos5/libexec/digest-service/Makefile head/kerberos5/libexec/hprop/Makefile head/kerberos5/libexec/hpropd/Makefile head/kerberos5/libexec/ipropd-master/Makefile head/kerberos5/libexec/ipropd-slave/Makefile head/kerberos5/libexec/kadmind/Makefile head/kerberos5/libexec/kcm/Makefile head/kerberos5/libexec/kdc/Makefile head/kerberos5/libexec/kdigest/Makefile head/kerberos5/libexec/kfd/Makefile head/kerberos5/libexec/kimpersonate/Makefile head/kerberos5/libexec/kpasswdd/Makefile head/kerberos5/tools/asn1_compile/Makefile head/kerberos5/tools/slc/Makefile head/kerberos5/usr.bin/hxtool/Makefile head/kerberos5/usr.bin/kadmin/Makefile head/kerberos5/usr.bin/kcc/Makefile head/kerberos5/usr.bin/kdestroy/Makefile head/kerberos5/usr.bin/kf/Makefile head/kerberos5/usr.bin/kgetcred/Makefile head/kerberos5/usr.bin/kinit/Makefile head/kerberos5/usr.bin/kpasswd/Makefile head/kerberos5/usr.bin/ksu/Makefile head/kerberos5/usr.bin/string2key/Makefile head/kerberos5/usr.bin/verify_krb5_conf/Makefile head/kerberos5/usr.sbin/iprop-log/Makefile head/kerberos5/usr.sbin/kstash/Makefile head/kerberos5/usr.sbin/ktutil/Makefile Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/Makefile.inc Tue Nov 25 09:57:42 2014 (r275022) @@ -16,9 +16,6 @@ LDAPCFLAGS= -I${OPENLDAPBASE}/include -D LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib .endif -LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a -LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a - .if defined(SRCS) ETSRCS= \ Modified: head/kerberos5/lib/libasn1/Makefile ============================================================================== --- head/kerberos5/lib/libasn1/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libasn1/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_krb5/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libgssapi_krb5/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_ntlm/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_spnego/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libgssapi_spnego/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libhdb/Makefile ============================================================================== --- head/kerberos5/lib/libhdb/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libhdb/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 heimsqlite +DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 Modified: head/kerberos5/lib/libheimbase/Makefile ============================================================================== --- head/kerberos5/lib/libheimbase/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libheimbase/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,7 +2,7 @@ LIB= heimbase LDFLAGS= -Wl,--no-undefined -LDADD= -lpthread +LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map INCS= heimbase.h Modified: head/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- head/kerberos5/lib/libheimipcc/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libheimipcc/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,8 +2,7 @@ LIB= heimipcc PRIVATELIB= -LDADD= -lheimbase -lroken -lpthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} +LIBADD= heimbase roken pthread SRCS= \ client.c \ Modified: head/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- head/kerberos5/lib/libheimipcs/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libheimipcs/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,9 +2,7 @@ LIB= heimipcs PRIVATELIB= -LDADD= -lheimbase -lroken -LDFLAGS= -pthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} +LIBADD= heimbase roken pthread SRCS= \ server.c \ Modified: head/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- head/kerberos5/lib/libheimntlm/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libheimntlm/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/lib/libheimsqlite/Makefile ============================================================================== --- head/kerberos5/lib/libheimsqlite/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libheimsqlite/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,8 +2,7 @@ LIB= heimsqlite SRCS= sqlite3.c -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread CFLAGS+=-I${KRB5DIR}/lib/sqlite .include <bsd.lib.mk> Modified: head/kerberos5/lib/libhx509/Makefile ============================================================================== --- head/kerberos5/lib/libhx509/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libhx509/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- head/kerberos5/lib/libkadm5clnt/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libkadm5clnt/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- head/kerberos5/lib/libkadm5srv/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libkadm5srv/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/lib/libkafs5/Makefile ============================================================================== --- head/kerberos5/lib/libkafs5/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libkafs5/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/lib/libkdc/Makefile ============================================================================== --- head/kerberos5/lib/libkdc/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libkdc/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/lib/libkrb5/Makefile ============================================================================== --- head/kerberos5/lib/libkrb5/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libkrb5/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ @@ -628,3 +626,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ .include <bsd.lib.mk> .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ +USEPRIVATELIB= heimipcc Modified: head/kerberos5/lib/libroken/Makefile ============================================================================== --- head/kerberos5/lib/libroken/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libroken/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 \ Modified: head/kerberos5/lib/libwind/Makefile ============================================================================== --- head/kerberos5/lib/libwind/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/lib/libwind/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -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 Modified: head/kerberos5/libexec/digest-service/Makefile ============================================================================== --- head/kerberos5/libexec/digest-service/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/digest-service/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -8,11 +8,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} -lheimntlm -USEPRIVATELIB= heimipcs +LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm .include <bsd.prog.mk> Modified: head/kerberos5/libexec/hprop/Makefile ============================================================================== --- head/kerberos5/libexec/hprop/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/hprop/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/libexec/hpropd/Makefile ============================================================================== --- head/kerberos5/libexec/hpropd/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/hpropd/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -4,10 +4,9 @@ PROG= hpropd MAN= hpropd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/libexec/ipropd-master/Makefile ============================================================================== --- head/kerberos5/libexec/ipropd-master/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/ipropd-master/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -5,10 +5,9 @@ MAN= iprop.8 SRCS= ipropd_common.c ipropd_master.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} foo:: Modified: head/kerberos5/libexec/ipropd-slave/Makefile ============================================================================== --- head/kerberos5/libexec/ipropd-slave/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/ipropd-slave/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -5,10 +5,9 @@ MAN= SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kadmind/Makefile ============================================================================== --- head/kerberos5/libexec/kadmind/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kadmind/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -9,10 +9,9 @@ SRCS= rpc.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \ - ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD} -LDADD= -lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \ - -lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD} +LIBADD= kadm5srv gssapi hdb krb5 roken vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kcm/Makefile ============================================================================== --- head/kerberos5/libexec/kcm/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kcm/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -19,11 +19,9 @@ SRCS= acl.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \ - ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \ - -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD} -USEPRIVATELIB= heimipcs +LIBADD= krb5 roken heimntlm heimipcs crypto +DPADD= ${LDAPDPADD} +LDADD= ${LIBVERS} ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kdc/Makefile ============================================================================== --- head/kerberos5/libexec/kdc/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kdc/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -10,9 +10,7 @@ SRCS= config.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= kdc hdb krb5 roken crypt vers .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kdigest/Makefile ============================================================================== --- head/kerberos5/libexec/kdigest/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kdigest/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -5,10 +5,7 @@ MAN= kdigest.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \ - ${LIBVERS} -ledit +LIBADD= krb5 heimntlm roken crypto edit sl vers SRCS= kdigest.c \ kdigest-commands.c \ kdigest-commands.h Modified: head/kerberos5/libexec/kfd/Makefile ============================================================================== --- head/kerberos5/libexec/kfd/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kfd/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -4,10 +4,7 @@ PROG= kfd MAN= kfd.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kimpersonate/Makefile ============================================================================== --- head/kerberos5/libexec/kimpersonate/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kimpersonate/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -6,10 +6,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken asn1 vers .include <bsd.prog.mk> Modified: head/kerberos5/libexec/kpasswdd/Makefile ============================================================================== --- head/kerberos5/libexec/kpasswdd/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/libexec/kpasswdd/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -3,10 +3,9 @@ PROG= kpasswdd MAN= kpasswdd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} -LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LIBADD= kadm5srv hdb krb5 roken vers asn1 +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- head/kerberos5/tools/asn1_compile/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/tools/asn1_compile/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -3,8 +3,9 @@ PROG= asn1_compile MAN= LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a -LDADD= ${LIBROKEN_A} ${LIBVERS} -DPADD= ${LIBROKEN_A} ${LIBVERS} +LIBADD= vers +LDADD= ${LIBROKEN_A} +DPADD= ${LIBROKEN_A} SRCS= \ asn1parse.y \ Modified: head/kerberos5/tools/slc/Makefile ============================================================================== --- head/kerberos5/tools/slc/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/tools/slc/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,8 +2,9 @@ PROG= slc LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a -LDADD= ${LIBROKEN_A} ${LIBVERS} -DPADD= ${LIBROKEN_A} ${LIBVERS} +LIBADD= vers +LDADD= ${LIBROKEN_A} +DPADD= ${LIBROKEN_A} MAN= SRCS= roken.h \ Modified: head/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- head/kerberos5/usr.bin/hxtool/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/hxtool/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -6,8 +6,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit +LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h hxtool-commands.h: hxtool-commands.in Modified: head/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- head/kerberos5/usr.bin/kadmin/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kadmin/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -26,14 +26,9 @@ SRCS= add_enctype.c \ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} -DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \ - ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD} -LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \ - ${LIBSL} -lroken ${LIBVERS} -lasn1 \ - -lcrypto -lcrypt -lcom_err \ - -ledit -lncursesw ${LDAPLDADD} +LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- head/kerberos5/usr.bin/kcc/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kcc/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -8,10 +8,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT} -LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \ - ${LIBVERS} -ledit +LIBADD= krb5 roken asn1 kafs5 edit sl vers SRCS= kcc.c \ kcc-commands.c \ kcc-commands.h \ Modified: head/kerberos5/usr.bin/kdestroy/Makefile ============================================================================== --- head/kerberos5/usr.bin/kdestroy/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kdestroy/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,10 +2,7 @@ PROG= kdestroy CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt +LIBADD= kafs5 krb5 roken vers MAN= kdestroy.1 .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/kf/Makefile ============================================================================== --- head/kerberos5/usr.bin/kf/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kf/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -4,10 +4,7 @@ PROG= kf MAN= kf.1 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ - ${LIBVERS} +LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/kgetcred/Makefile ============================================================================== --- head/kerberos5/usr.bin/kgetcred/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kgetcred/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -3,8 +3,7 @@ PROG= kgetcred CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= krb5 roken asn1 vers .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/kinit/Makefile ============================================================================== --- head/kerberos5/usr.bin/kinit/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kinit/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,10 +2,7 @@ PROG= kinit CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= kafs5 krb5 heimntlm roken crypto vers .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/kpasswd/Makefile ============================================================================== --- head/kerberos5/usr.bin/kpasswd/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/kpasswd/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -2,10 +2,7 @@ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= hdb krb5 roken vers crypto .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/ksu/Makefile ============================================================================== --- head/kerberos5/usr.bin/ksu/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/ksu/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -8,10 +8,7 @@ PRECIOUSPROG= MAN= SRCS= su.c CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= kafs5 krb5 roken vers crypto crypt .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- head/kerberos5/usr.bin/string2key/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/string2key/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -7,9 +7,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/windc -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} +LIBADD= krb5 roken crypto vers .include <bsd.prog.mk> Modified: head/kerberos5/usr.bin/verify_krb5_conf/Makefile ============================================================================== --- head/kerberos5/usr.bin/verify_krb5_conf/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.bin/verify_krb5_conf/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -3,10 +3,7 @@ PROG= verify_krb5_conf MAN= verify_krb5_conf.8 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err +LIBADD= krb5 roken vers .include <bsd.prog.mk> Modified: head/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- head/kerberos5/usr.sbin/iprop-log/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.sbin/iprop-log/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -8,10 +8,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ -I. -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT} -LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ - ${LIBVERS} -ledit +LIBADD= kadm5srv hdb krb5 roken edit sl vers iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in} Modified: head/kerberos5/usr.sbin/kstash/Makefile ============================================================================== --- head/kerberos5/usr.sbin/kstash/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.sbin/kstash/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -4,10 +4,9 @@ PROG= kstash MAN= kstash.8 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt ${LDAPLDADD} +LIBADD= hdb krb5 crypto vers +DPADD= ${LDAPDPADD} +LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/usr.sbin/ktutil/Makefile ============================================================================== --- head/kerberos5/usr.sbin/ktutil/Makefile Tue Nov 25 09:54:05 2014 (r275021) +++ head/kerberos5/usr.sbin/ktutil/Makefile Tue Nov 25 09:57:42 2014 (r275022) @@ -17,10 +17,7 @@ SRCS= add.c \ rename.c CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I. -DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBEDIT} -LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -ledit +LIBADD= kadm5clnt krb5 roken crypto edit sl vers .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411250957.sAP9vhlG058729>