diff options
author | gibbs <gibbs@FreeBSD.org> | 1995-09-14 18:16:18 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1995-09-14 18:16:18 +0000 |
commit | 599a0e919ce0e33a30d3c761b5fd0186530cd7a9 (patch) | |
tree | 0f945227f3c97d03ee66983460e3df4f01a8e5a5 | |
parent | 6d71f32a42887d0c64769283d9e9a465a40b81a3 (diff) | |
download | FreeBSD-src-599a0e919ce0e33a30d3c761b5fd0186530cd7a9.zip FreeBSD-src-599a0e919ce0e33a30d3c761b5fd0186530cd7a9.tar.gz |
Fix a few problems with the depend target.
Pointed out by: Mark Murray <markm>
-rw-r--r-- | eBones/Makefile.inc | 10 | ||||
-rw-r--r-- | eBones/des/Makefile | 4 | ||||
-rw-r--r-- | eBones/lib/libkadm/Makefile | 4 | ||||
-rw-r--r-- | eBones/usr.bin/kadmin/Makefile | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/eBones/Makefile.inc b/eBones/Makefile.inc index edffb75..1dba808 100644 --- a/eBones/Makefile.inc +++ b/eBones/Makefile.inc @@ -1,8 +1,10 @@ # From: @(#)Makefile.inc 5.1 (Berkeley) 6/25/90 -# $Id: Makefile.inc,v 1.6 1995/09/07 21:36:27 markm Exp $ +# $Id: Makefile.inc,v 1.7 1995/09/14 04:00:59 gibbs Exp $ DISTRIBUTION= krb +INCLUDEDIR= ${.CURDIR}/../../include + .if exists(${.CURDIR}/../../des/obj) DESOBJDIR= ${.CURDIR}/../../des/obj .else @@ -33,18 +35,18 @@ KADMOBJDIR= ${.CURDIR}/../../lib/libkadm/obj KADMOBJDIR= ${.CURDIR}/../../lib/libkadm .endif -CFLAGS+= -I${.CURDIR}/../../include -Wall +CFLAGS+= -I${INCLUDEDIR} -Wall COMPILE_ET= compile_et ${KRBOBJDIR}/krb_err.h: ${.CURDIR}/../../lib/libkrb/krb_err.et - test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.IMPSRC} ${KRBOBJDIR} + test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR} cd ${KRBOBJDIR}; compile_et krb_err.et CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c ${KADMOBJDIR}/kadm_err.h: ${.CURDIR}/../../lib/libkadm/kadm_err.et - test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.IMPSRC} ${KADMOBJDIR} + test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR} cd ${KADMOBJDIR}; compile_et kadm_err.et CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c diff --git a/eBones/des/Makefile b/eBones/des/Makefile index 0dc3484..88533fc 100644 --- a/eBones/des/Makefile +++ b/eBones/des/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.4 (Berkeley) 5/7/91 -# $Id: Makefile,v 1.5 1995/07/18 16:34:59 mark Exp $ +# $Id: Makefile,v 1.3 1995/09/07 21:36:46 markm Exp $ LIB= des SRCS= cbc_cksm.c cbc_enc.c ecb_enc.c enc_read.c enc_writ.c pcbc_enc.c \ @@ -19,7 +19,7 @@ CFLAGS+= -DDES_ENCRYPT -DKRBDES_ENCRYPT #CFLAGS+= -DKRB5 #SRCS+= kerberos5.c -CFLAGS+= -I${.CURDIR}/include -DAUTHENTICATE +CFLAGS+= -I${.CURDIR}/include -I${.CURDIR}/../include -DAUTHENTICATE SHLIB_MAJOR?= 2 SHLIB_MINOR?= 0 diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile index f015f96..35a0a5b 100644 --- a/eBones/lib/libkadm/Makefile +++ b/eBones/lib/libkadm/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.4 1995/09/13 17:23:51 markm Exp $ +# $Id: Makefile,v 1.5 1995/09/14 04:04:52 gibbs Exp $ LIB= kadm @@ -18,5 +18,7 @@ beforeinstall: .include <bsd.lib.mk> +kadm_err.c: ${KADMOBJDIR}/kadm_err.h + kadm_cli_wrap.o: ${KRBOBJDIR}/krb_err.h kadm_err.c: ${KADMOBJDIR}/kadm_err.h diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile index 48a6d1d..7660270 100644 --- a/eBones/usr.bin/kadmin/Makefile +++ b/eBones/usr.bin/kadmin/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.5 1995/09/13 17:24:06 markm Exp $ +# $Id: Makefile,v 1.6 1995/09/14 04:05:59 gibbs Exp $ PROG= kadmin -SRCS= kadmin.c kadmin_cmds.c +SRCS= ${KRBOBJDIR}/krb_err.h kadmin.c kadmin_cmds.c CLEANFILES+= kadmin_cmds.c krb_err.c CFLAGS+= -DPOSIX -I${.CURDIR}/../../lib/libkadm DPADD= ${LIBKRB} ${LIBDES} @@ -14,5 +14,3 @@ kadmin_cmds.c: kadmin_cmds.ct mk_cmds kadmin_cmds.ct .include <bsd.prog.mk> - -kadmin.o: ${KRBOBJDIR}/krb_err.h |