diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /kerberos5/usr.sbin | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'kerberos5/usr.sbin')
| -rw-r--r-- | kerberos5/usr.sbin/iprop-log/Makefile | 5 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/iprop-log/Makefile.depend | 2 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/kstash/Makefile | 7 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/kstash/Makefile.depend | 2 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/ktutil/Makefile | 5 |
5 files changed, 7 insertions, 14 deletions
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index 176012a9e7d9..f31be516fb28 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -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} diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend index 6cd298d08a7f..8d6a1ea2499c 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile.depend +++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend @@ -12,7 +12,6 @@ DIRDEPS = \ kerberos5/lib/libhdb \ kerberos5/lib/libheimbase \ kerberos5/lib/libheimipcc \ - kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkadm5srv \ kerberos5/lib/libkrb5 \ @@ -26,6 +25,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ lib/libedit \ + lib/libsqlite3 \ lib/libthr \ lib/ncurses/ncursesw \ secure/lib/libcrypto \ diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 024e45dba917..d96c96c75121 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -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> diff --git a/kerberos5/usr.sbin/kstash/Makefile.depend b/kerberos5/usr.sbin/kstash/Makefile.depend index 63599a91e694..b09cf17be415 100644 --- a/kerberos5/usr.sbin/kstash/Makefile.depend +++ b/kerberos5/usr.sbin/kstash/Makefile.depend @@ -13,7 +13,6 @@ DIRDEPS = \ kerberos5/lib/libheimbase \ kerberos5/lib/libheimipcc \ kerberos5/lib/libheimntlm \ - kerberos5/lib/libheimsqlite \ kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ kerberos5/lib/libroken \ @@ -24,6 +23,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libsqlite3 \ lib/libthr \ lib/libutil \ secure/lib/libcrypto \ diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index f7d340f78e9a..fe45494c40cb 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -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> |