Fix a break in the includes where the build blows chunks if it is

being built in a totally clean environment.

Found by: jkh and "make release"
This commit is contained in:
Mark Murray 1997-10-02 15:03:23 +00:00
parent 2d7a5bff3b
commit 0d5894c3bd
11 changed files with 30 additions and 7 deletions

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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} \

View File

@ -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 <bsd.prog.mk>
.PATH: ${KRB4DIR}/kadmin
beforedepend all: ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h

View File

@ -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