[src/trunk]: src Use bsd.crypto.mk.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48ee6ecb49f9
branches:  trunk
changeset: 474631:48ee6ecb49f9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 12 22:11:37 1999 +0000

description:
Use bsd.crypto.mk.

diffstat:

 usr.bin/Makefile        |  12 ++++++++----
 usr.bin/login/Makefile  |  22 +++++++---------------
 usr.bin/passwd/Makefile |   8 +++++++-
 usr.bin/rlogin/Makefile |   9 ++++++++-
 usr.bin/su/Makefile     |   9 ++++++++-
 usr.bin/telnet/Makefile |  36 ++++++++++++++----------------------
 usr.sbin/Makefile       |   9 ++++++++-
 7 files changed, 60 insertions(+), 45 deletions(-)

diffs (227 lines):

diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/Makefile
--- a/usr.bin/Makefile  Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/Makefile  Mon Jul 12 22:11:37 1999 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.104 1999/07/12 03:21:50 darrenr Exp $
+#      $NetBSD: Makefile,v 1.105 1999/07/12 22:11:37 thorpej Exp $
 #      from: @(#)Makefile      8.3 (Berkeley) 1/7/94
 
-.include <bsd.own.mk>                  # for EXPORTABLE_SYSTEM definition
-#                                      # and OBJECT_FMT definition
+SRCTOP=        ..
+.include <bsd.crypto.mk>
 
-SUBDIR=        apply apropos asa at audio banner basename bdes biff \
+SUBDIR=        apply apropos asa at audio banner basename biff \
        bzip2 bzip2recover cal calendar cap_mkdb cdplay checknr chflags \
        chpass cksum cmp col colcrt colrm column comm compress \
        crontab crunch ctags cut dirname du eject elf2aout elf2ecoff env \
@@ -27,4 +27,8 @@
        write xargs xinstall xlint xstr yacc yes ypcat \
        ypmatch ypwhich
 
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/Makefile.frag"
+.endif
+
 .include <bsd.subdir.mk>
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/login/Makefile
--- a/usr.bin/login/Makefile    Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/login/Makefile    Mon Jul 12 22:11:37 1999 +0000
@@ -1,12 +1,8 @@
-#      $NetBSD: Makefile,v 1.22 1999/07/12 21:36:10 aidan Exp $
+#      $NetBSD: Makefile,v 1.23 1999/07/12 22:11:37 thorpej Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 
-.include <bsd.own.mk>                  # for EXPORTABLE_SYSTEM definition
-
-.if !exists(${.CURDIR}/../../domestic/usr.bin/login) && \
-    !exists(${.CURDIR}/../../crypto-us/usr.bin/login) || \
-    defined(EXPORTABLE_SYSTEM) || \
-    make(obj) || make(clean) || make(cleandir) || make(distclean)
+SRCTOP=        ../..
+.include <bsd.crypto.mk>
 
 PROG=  login
 SRCS=  login.c
@@ -24,12 +20,8 @@
 LDADD+=        -lskey
 .endif
 
-.include <bsd.prog.mk>
-
-.else  # EXPORTABLE_SYSTEM
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/login/Makefile.frag"
+.endif
 
-MAN=   login.1
-
-.include <bsd.man.mk>
-
-.endif # EXPORTABLE_SYSTEM
+.include <bsd.prog.mk>
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile   Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/passwd/Makefile   Mon Jul 12 22:11:37 1999 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.20 1999/02/18 21:22:52 scottr Exp $
+#      $NetBSD: Makefile,v 1.21 1999/07/12 22:11:38 thorpej Exp $
 #      from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 
+SRCTOP=        ../..
+.include <bsd.crypto.mk>
 
 PROG=  passwd
 SRCS=  local_passwd.c yp_passwd.c passwd.c getpwent.c
@@ -18,6 +20,10 @@
 INSTALLFLAGS=-fschg
 .endif
 
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/passwd/Makefile.frag"
+.endif
+
 .include <bsd.prog.mk>
 
 getpwent.o: getpwent.c
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/rlogin/Makefile
--- a/usr.bin/rlogin/Makefile   Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/rlogin/Makefile   Mon Jul 12 22:11:37 1999 +0000
@@ -1,6 +1,9 @@
-#      $NetBSD: Makefile,v 1.12 1999/02/18 21:22:51 scottr Exp $
+#      $NetBSD: Makefile,v 1.13 1999/07/12 22:11:38 thorpej Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 
+SRCTOP=        ../..
+.include <bsd.crypto.mk>
+
 PROG=  rlogin
 SRCS=  rlogin.c
 
@@ -8,4 +11,8 @@
 BINMODE=4555
 #INSTALLFLAGS=-fschg
 
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/rlogin/Makefile.frag"
+.endif
+
 .include <bsd.prog.mk>
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/su/Makefile
--- a/usr.bin/su/Makefile       Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/su/Makefile       Mon Jul 12 22:11:37 1999 +0000
@@ -1,6 +1,9 @@
-#      $NetBSD: Makefile,v 1.14 1999/07/11 23:41:10 kim Exp $
+#      $NetBSD: Makefile,v 1.15 1999/07/12 22:11:38 thorpej Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 7/19/93
 
+SRCTOP=        ../..
+.include <bsd.crypto.mk>
+
 PROG=  su
 DPADD+=        ${LIBCRYPT}
 LDADD+=        -lcrypt
@@ -12,6 +15,10 @@
 #
 #CPPFLAGS+=-DSUGROUP=\"sugroup\"
 
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/su/Makefile.frag"
+.endif
+
 .include <bsd.prog.mk>
 
 .ifdef SKEY
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.bin/telnet/Makefile   Mon Jul 12 22:11:37 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 1999/07/02 15:09:10 itojun Exp $
+#      $NetBSD: Makefile,v 1.18 1999/07/12 22:11:38 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -34,22 +34,17 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 #
 
-.include <bsd.own.mk>                  # for EXPORTABLE_SYSTEM definition
-
-# XXX Keep telnet(1) and libtelnet from getting out of sync during the build
-# XXX process.
-.if (!exists(${.CURDIR}/../../domestic/usr.bin/telnet) && \
-     !exists(${.CURDIR}/../../crypto-us/usr.bin/telnet)) || \
-    defined(EXPORTABLE_SYSTEM) || \
-    make(obj) || make(clean) || make(cleandir) || make(distclean)
+SRCTOP=        ../..
+.include <bsd.crypto.mk>
 
 PROG=  telnet
 
 CPPFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -Dunix
 CPPFLAGS+=-DENV_HACK
-CPPFLAGS+=-I${.CURDIR}/../../lib
+CPPFLAGS+=-I${.CURDIR}
+
 LDADD+= -ltermcap -ltelnet
-DPADD= ${LIBTERMCAP} ${LIBTELNET}
+DPADD+=        ${LIBTERMCAP} ${LIBTELNET}
 
 SRCS=  authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
        terminal.c tn3270.c utilities.c
@@ -59,20 +54,17 @@
 CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile
 NOCRYPT_DIR=${.CURDIR}/Nocrypt
 
-.include <bsd.prog.mk>
-
-.else  # EXPORTABLE_SYSTEM
-
-MAN=   telnet.1
-
-.include <bsd.man.mk>
-
-.endif # EXPORTABLE_SYSTEM
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.bin/telnet/Makefile.frag"
+.endif
 
 CPPFLAGS+=-DIPSEC
 LDADD+=        -lipsec
 DPADD+=        ${LIBIPSEC}
 CPPFLAGS+=-DINET6
 
-nocrypt:
-       @echo "Encryption code already removed."
+LIBTELNETINCS?=-I${.CURDIR}/../../lib
+
+CPPFLAGS+=${LIBTELNETINCS}
+
+.include <bsd.prog.mk>
diff -r 416666ab8426 -r 48ee6ecb49f9 usr.sbin/Makefile
--- a/usr.sbin/Makefile Mon Jul 12 22:10:52 1999 +0000
+++ b/usr.sbin/Makefile Mon Jul 12 22:11:37 1999 +0000
@@ -1,9 +1,12 @@
-#      $NetBSD: Makefile,v 1.118 1999/07/11 17:35:33 itojun Exp $
+#      $NetBSD: Makefile,v 1.119 1999/07/12 22:12:06 thorpej Exp $
 #      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
 
 # XXX Temporary for NO_SENDMAIL and BUILD_POSTFIX
 .include <bsd.own.mk>
 
+SRCTOP=        ..
+.include <bsd.crypto.mk>
+
 SUBDIR=        ac accton amd apm apmd arp bad144 bind bootp catman \
        chown chroot chrtbl config cron dbsym dev_mkdb \
        dhcp diskpart dumpfs dumplfs edquota eeprom eshconfig greconfig \
@@ -36,4 +39,8 @@
 SUBDIR+=       postfix
 .endif
 
+.if defined(CRYPTOPATH)
+.include "${CRYPTOPATH}/usr.sbin/Makefile.frag"
+.endif
+
 .include <bsd.subdir.mk>