Index: stable/10/kerberos5/libexec/kdigest/Makefile =================================================================== --- stable/10/kerberos5/libexec/kdigest/Makefile (revision 289041) +++ stable/10/kerberos5/libexec/kdigest/Makefile (revision 289042) @@ -1,27 +1,25 @@ # $FreeBSD$ PROG= kdigest 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 SRCS= kdigest.c \ kdigest-commands.c \ kdigest-commands.h CLEANFILES= kdigest-commands.h kdigest-commands.c kdigest-commands.h: kdigest-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in c o -kdigest-commands.${ext}: kdigest-commands.h -.endfor +kdigest-commands.c: kdigest-commands.h .include .PATH: ${KRB5DIR}/kuser Index: stable/10/kerberos5/usr.bin/hxtool/Makefile =================================================================== --- stable/10/kerberos5/usr.bin/hxtool/Makefile (revision 289041) +++ stable/10/kerberos5/usr.bin/hxtool/Makefile (revision 289042) @@ -1,24 +1,22 @@ # $FreeBSD$ PROG= hxtool MAN= 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 SRCS= hxtool.c hxtool-commands.c hxtool-commands.h CLEANFILES= hxtool-commands.h hxtool-commands.c hxtool-commands.h: hxtool-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in c o -hxtool-commands.${ext}: hxtool-commands.h -.endfor +hxtool-commands.c: hxtool-commands.h .include .PATH: ${KRB5DIR}/lib/hx509 Index: stable/10/kerberos5/usr.bin/kadmin/Makefile =================================================================== --- stable/10/kerberos5/usr.bin/kadmin/Makefile (revision 289041) +++ stable/10/kerberos5/usr.bin/kadmin/Makefile (revision 289042) @@ -1,51 +1,49 @@ # $FreeBSD$ PROG= kadmin MAN= kadmin.8 SRCS= add_enctype.c \ ank.c \ check.c \ cpw.c \ del.c \ del_enctype.c \ dump.c \ ext.c \ get.c \ init.c \ kadmin.c \ kadmin-commands.c \ kadmin-commands.h \ load.c \ mod.c \ pw_quality.c \ random_password.c \ rename.c \ stash.c \ util.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} ${LIBNCURSES} ${LDAPDPADD} LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \ ${LIBSL} -lroken ${LIBVERS} -lasn1 \ -lcrypto -lcrypt -lcom_err \ -ledit -lncurses ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} CLEANFILES= kadmin-commands.h kadmin-commands.c .include kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in o c -kadmin-commands.${ext}: kadmin-commands.h -.endfor +kadmin-commands.c: kadmin-commands.h .PATH: ${KRB5DIR}/kadmin Index: stable/10/kerberos5/usr.bin/kcc/Makefile =================================================================== --- stable/10/kerberos5/usr.bin/kcc/Makefile (revision 289041) +++ stable/10/kerberos5/usr.bin/kcc/Makefile (revision 289042) @@ -1,33 +1,31 @@ # $FreeBSD$ PROG= kcc MAN= klist.1 kswitch.1 LINKS= ${BINDIR}/kcc ${BINDIR}/klist \ ${BINDIR}/kcc ${BINDIR}/kswitch 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 SRCS= kcc.c \ kcc-commands.c \ kcc-commands.h \ klist.c \ kswitch.c \ copy_cred_cache.c CLEANFILES= kcc-commands.h kcc-commands.c kcc-commands.h: kcc-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in c o -kcc-commands.${ext}: kcc-commands.h -.endfor +kcc-commands.c: kcc-commands.h .include .PATH: ${KRB5DIR}/kuser Index: stable/10/kerberos5/usr.sbin/iprop-log/Makefile =================================================================== --- stable/10/kerberos5/usr.sbin/iprop-log/Makefile (revision 289041) +++ stable/10/kerberos5/usr.sbin/iprop-log/Makefile (revision 289042) @@ -1,28 +1,26 @@ # $FreeBSD$ PROG= iprop-log MAN= iprop-log.8 SRCS= iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/krb5 \ -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 LDFLAGS=${LDAPLDFLAGS} CLEANFILES= iprop-commands.h iprop-commands.c iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in c o -iprop-commands.${ext}: iprop-commands.h -.endfor +iprop-commands.c: iprop-commands.h .include .PATH: ${KRB5DIR}/lib/kadm5 Index: stable/10/kerberos5/usr.sbin/ktutil/Makefile =================================================================== --- stable/10/kerberos5/usr.sbin/ktutil/Makefile (revision 289041) +++ stable/10/kerberos5/usr.sbin/ktutil/Makefile (revision 289042) @@ -1,36 +1,34 @@ # $FreeBSD$ PROG= ktutil MAN= ktutil.8 SRCS= add.c \ change.c \ copy.c \ destroy.c \ get.c \ ktutil.c \ ktutil-commands.c \ ktutil-commands.h \ list.c \ purge.c \ remove.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 CLEANFILES= ktutil-commands.h ktutil-commands.c .include ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in ${SLC} ${.ALLSRC:M*.in} -.for ext in c o -ktutil-commands.${ext}: ktutil-commands.h -.endfor +ktutil-commands.c: ktutil-commands.h .PATH: ${KRB5DIR}/admin Index: stable/10 =================================================================== --- stable/10 (revision 289041) +++ stable/10 (revision 289042) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r288198,288200