diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile index 334caf767749..e561da1734b1 100644 --- a/kerberos5/lib/libtelnet/Makefile +++ b/kerberos5/lib/libtelnet/Makefile @@ -5,7 +5,8 @@ LIB= telnet SRCS= genget.c getent.c misc.c encrypt.c auth.c kerberos.c enc_des.c CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ - -DKRB4 -I${TELNETDIR} + -DKRB4 -I${TELNETDIR} \ + -I${KRB4DIR}/lib/krb INCLUDES= ${TELNETDIR}/arpa/telnet.h diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile index e1a7c21b6802..d2e28d94fe74 100644 --- a/kerberosIV/Makefile +++ b/kerberosIV/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:12 markm Exp $ +# $Id$ SUBDIR= include lib libexec usr.bin usr.sbin @@ -28,9 +28,10 @@ kprog: cd ${SDIR}/sbin/restore; ${CODAI} bootstrap: - ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all install kprog + cd ${.CURDIR} ; \ + ${MAKE} ${MFLAGS} cleandir ; \ + ${MAKE} ${MFLAGS} obj ; \ + ${MAKE} ${MFLAGS} depend all install kprog help-distribute: distribute cd ${SDIR}/bin/rcp; ${CODAD} diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile index 334caf767749..e561da1734b1 100644 --- a/kerberosIV/lib/libtelnet/Makefile +++ b/kerberosIV/lib/libtelnet/Makefile @@ -5,7 +5,8 @@ LIB= telnet SRCS= genget.c getent.c misc.c encrypt.c auth.c kerberos.c enc_des.c CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ - -DKRB4 -I${TELNETDIR} + -DKRB4 -I${TELNETDIR} \ + -I${KRB4DIR}/lib/krb INCLUDES= ${TELNETDIR}/arpa/telnet.h diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index 6dbd6ad189cc..f9d7d01f15b1 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -5,8 +5,10 @@ MAN8= ${KRB4DIR}/man/ext_srvtab.8 SRCS= ext_srvtab.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ - -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ + -I${KRB4DIR}/lib/krb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index e89b3d9f2b6a..af5277d776f6 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -5,6 +5,8 @@ MAN8= ${KRB4DIR}/man/kdb_destroy.8 SRCS= kdb_destroy.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index 9ebc023c49db..e5a7ff9617c9 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -5,6 +5,8 @@ MAN8= ${KRB4DIR}/man/kdb_edit.8 SRCS= kdb_edit.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index b0f494521c01..d51519a5b9fb 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -5,6 +5,8 @@ MAN8= ${KRB4DIR}/man/kdb_init.8 SRCS= kdb_init.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index a2dc91c3878c..e43fd5555c24 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -5,6 +5,8 @@ MAN8= ${KRB4DIR}/man/kdb_util.8 SRCS= kdb_util.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile index 444d623ac7fd..5c9f0242bbcf 100644 --- a/kerberosIV/usr.sbin/kerberos/Makefile +++ b/kerberosIV/usr.sbin/kerberos/Makefile @@ -8,6 +8,8 @@ MAN8= ${KRB4DIR}/man/kerberos.8 SRCS= kerberos.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KADMOBJDIR} \ -I${KRBOBJDIR} \ diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile index a41f671266d2..47d7c185cc9d 100644 --- a/kerberosIV/usr.sbin/ksrvutil/Makefile +++ b/kerberosIV/usr.sbin/ksrvutil/Makefile @@ -6,8 +6,12 @@ SRCS= ksrvutil.c ksrvutil_get.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/sl \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ + -I${KADMOBJDIR} \ + -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken -L${KADMOBJDIR} -lkadm \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcom_err @@ -17,3 +21,5 @@ DPADD= ${LIBROKEN} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ .include .PATH: ${KRB4DIR}/kadmin + +beforedepend all: ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index 1bacfe92cf5c..0dcdc60b651a 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -7,6 +7,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ + -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/kdb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes