From 92b9ceada4151a9999506e28ff30b4c0017e77a2 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Thu, 14 Jul 2005 18:02:33 +0000 Subject: [PATCH] Instead of duplicating the Kerberos tools, use a single version. Switch to host tools, since they are running on the build system, not the target platform. Add an explicit dependency of buildincludes to depend in kerberos5/tools to ensure that the tools are available in phase 4a. --- Makefile.inc1 | 4 +-- kerberos5/Makefile.inc | 26 +++---------------- kerberos5/bintools/Makefile | 6 ----- kerberos5/bintools/Makefile.inc | 5 ---- kerberos5/bintools/asn1_compile/Makefile | 3 --- .../bintools/make-print-version/Makefile | 5 ---- kerberos5/bintools/make-roken/Makefile | 5 ---- kerberos5/tools/Makefile | 4 ++- kerberos5/tools/Makefile.inc | 4 +-- kerberos5/tools/asn1_compile/Makefile | 4 +-- kerberos5/tools/make-print-version/Makefile | 4 +-- kerberos5/tools/make-roken/Makefile | 4 +-- 12 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 kerberos5/bintools/Makefile delete mode 100644 kerberos5/bintools/Makefile.inc delete mode 100644 kerberos5/bintools/asn1_compile/Makefile delete mode 100644 kerberos5/bintools/make-print-version/Makefile delete mode 100644 kerberos5/bintools/make-roken/Makefile diff --git a/Makefile.inc1 b/Makefile.inc1 index e4e8cf2912..681ee645b4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.73 2005/07/13 12:34:21 joerg Exp $ +# $DragonFly: src/Makefile.inc1,v 1.74 2005/07/14 18:02:33 joerg Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -819,7 +819,7 @@ _fortran= gnu/usr.bin/cc34/f771 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ !defined(NOCRYPT) && defined(MAKE_KERBEROS5) -_libkrb5= kerberos5/bintools kerberos5/lib/libroken kerberos5/lib/libvers \ +_libkrb5= kerberos5/tools kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index f38dfc4b0d..700c66a541 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $ -# $DragonFly: src/kerberos5/Makefile.inc,v 1.6 2005/01/16 14:25:45 eirikn Exp $ +# $DragonFly: src/kerberos5/Makefile.inc,v 1.7 2005/07/14 18:02:33 joerg Exp $ NO_LINT= @@ -28,27 +28,9 @@ LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif -.if exists(${.OBJDIR}/../../tools/make-print-version/make-print-version) -MAKEPRINTVERSION=${.OBJDIR}/../../tools/make-print-version/make-print-version -.elif exists(${.OBJDIR}/../../bintools/make-print-version/make-print-version) -MAKEPRINTVERSION=${.OBJDIR}/../../bintools/make-print-version/make-print-version -.else -MAKEPRINTVERSION=make-print-version -.endif -.if exists(${.OBJDIR}/../../tools/make-roken/make-roken) -MAKEROKEN= ${.OBJDIR}/../../tools/make-roken/make-roken -.elif exists(${.OBJDIR}/../../bintools/make-roken/make-roken) -MAKEROKEN= ${.OBJDIR}/../../bintools/make-roken/make-roken -.else -MAKEROKEN= make-roken -.endif -.if exists(${.OBJDIR}/../../tools/asn1_compile/asn1_compile) -ASN1COMPILE= ${.OBJDIR}/../../tools/asn1_compile/asn1_compile -.elif exists(${.OBJDIR}/../../bintools/asn1_compile/asn1_compile) -ASN1COMPILE= ${.OBJDIR}/../../bintools/asn1_compile/asn1_compile -.else -ASN1COMPILE= asn1_compile -.endif +MAKEPRINTVERSION=${.OBJDIR}/../../tools/make-print-version/make-print-version.nx +MAKEROKEN= ${.OBJDIR}/../../tools/make-roken/make-roken.nx +ASN1COMPILE= ${.OBJDIR}/../../tools/asn1_compile/asn1_compile.nx .if defined(SRCS) diff --git a/kerberos5/bintools/Makefile b/kerberos5/bintools/Makefile deleted file mode 100644 index db7ccba10a..0000000000 --- a/kerberos5/bintools/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $ -# $DragonFly: src/kerberos5/bintools/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $ - -SUBDIR= make-print-version make-roken asn1_compile - -.include diff --git a/kerberos5/bintools/Makefile.inc b/kerberos5/bintools/Makefile.inc deleted file mode 100644 index fa8af98003..0000000000 --- a/kerberos5/bintools/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# $DragonFly: src/kerberos5/bintools/Attic/Makefile.inc,v 1.1 2005/01/16 14:25:45 eirikn Exp $ - -BINDIR= /usr/bin - -.include "../Makefile.inc" diff --git a/kerberos5/bintools/asn1_compile/Makefile b/kerberos5/bintools/asn1_compile/Makefile deleted file mode 100644 index d72f649db6..0000000000 --- a/kerberos5/bintools/asn1_compile/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# $DragonFly: src/kerberos5/bintools/asn1_compile/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $ - -.include "../../tools/asn1_compile/Makefile" diff --git a/kerberos5/bintools/make-print-version/Makefile b/kerberos5/bintools/make-print-version/Makefile deleted file mode 100644 index 4a4e5de520..0000000000 --- a/kerberos5/bintools/make-print-version/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $DragonFly: src/kerberos5/bintools/make-print-version/Attic/Makefile,v 1.1 2005/01/16 14:25:45 eirikn Exp $ - -depend: make-print-version - -.include "../../tools/make-print-version/Makefile" diff --git a/kerberos5/bintools/make-roken/Makefile b/kerberos5/bintools/make-roken/Makefile deleted file mode 100644 index 85418af8ee..0000000000 --- a/kerberos5/bintools/make-roken/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $DragonFly: src/kerberos5/bintools/make-roken/Attic/Makefile,v 1.1 2005/01/16 14:25:46 eirikn Exp $ - -depend: make-roken - -.include "../../tools/make-roken/Makefile" diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile index a7c5007e72..9ed5c7991d 100644 --- a/kerberos5/tools/Makefile +++ b/kerberos5/tools/Makefile @@ -1,6 +1,8 @@ # $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $ -# $DragonFly: src/kerberos5/tools/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $ +# $DragonFly: src/kerberos5/tools/Makefile,v 1.2 2005/07/14 18:02:33 joerg Exp $ SUBDIR= make-print-version make-roken asn1_compile +buildincludes: depend + .include diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc index e0559eebbe..d1dfdf24cf 100644 --- a/kerberos5/tools/Makefile.inc +++ b/kerberos5/tools/Makefile.inc @@ -1,6 +1,4 @@ # $FreeBSD: src/kerberos5/tools/Makefile.inc,v 1.1 2004/01/31 08:15:55 ru Exp $ -# $DragonFly: src/kerberos5/tools/Makefile.inc,v 1.1 2005/01/16 14:25:47 eirikn Exp $ - -realinstall: +# $DragonFly: src/kerberos5/tools/Makefile.inc,v 1.2 2005/07/14 18:02:33 joerg Exp $ .include "../Makefile.inc" diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile index 9d47b33468..16f02bda04 100644 --- a/kerberos5/tools/asn1_compile/Makefile +++ b/kerberos5/tools/asn1_compile/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.5 2004/12/21 08:47:01 ru Exp $ -# $DragonFly: src/kerberos5/tools/asn1_compile/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $ +# $DragonFly: src/kerberos5/tools/asn1_compile/Makefile,v 1.2 2005/07/14 18:02:33 joerg Exp $ PROG= asn1_compile NOMAN= @@ -37,7 +37,7 @@ print_version.h: roken.h: ${MAKEROKEN} > ${.TARGET} -.include +.include # There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers, # so the order of paths is important here. diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile index c79e0de7e7..2367df5412 100644 --- a/kerberos5/tools/make-print-version/Makefile +++ b/kerberos5/tools/make-print-version/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/kerberos5/tools/make-print-version/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $ -# $DragonFly: src/kerberos5/tools/make-print-version/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $ +# $DragonFly: src/kerberos5/tools/make-print-version/Makefile,v 1.2 2005/07/14 18:02:33 joerg Exp $ PROG= make-print-version NOMAN= -.include +.include .PATH: ${KRB5DIR}/lib/vers diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile index 887623f04c..d2219864de 100644 --- a/kerberos5/tools/make-roken/Makefile +++ b/kerberos5/tools/make-roken/Makefile @@ -1,12 +1,12 @@ # $FreeBSD: src/kerberos5/tools/make-roken/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $ -# $DragonFly: src/kerberos5/tools/make-roken/Makefile,v 1.1 2005/01/16 14:25:47 eirikn Exp $ +# $DragonFly: src/kerberos5/tools/make-roken/Makefile,v 1.2 2005/07/14 18:02:33 joerg Exp $ PROG= make-roken NOMAN= CLEANFILES= make-roken.c -.include +.include make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in awk -f ${.ALLSRC} > ${.TARGET} -- 2.41.0