From 080654b9b785c4c4ca5dbe4a6c96f1db9d8337fe Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 26 Mar 1997 00:33:39 +0000 Subject: [PATCH] no libcrypt, fix DPADD --- bin/ed/Makefile | 5 +---- libexec/ftpd/Makefile | 5 +---- libexec/rexecd/Makefile | 4 +--- libexec/telnetd/Makefile | 4 ++-- libexec/uucpd/Makefile | 4 +--- sbin/edlabel/Makefile | 7 ++++--- share/mk/bsd.prog.mk | 3 ++- usr.bin/ftp/Makefile | 3 ++- usr.bin/lock/Makefile | 4 +--- usr.bin/login/Makefile | 4 +--- usr.bin/passwd/Makefile | 4 ++-- usr.bin/skeyinit/Makefile | 4 +--- usr.bin/su/Makefile | 4 +--- usr.bin/sup/supfilesrv/Makefile | 4 +--- usr.bin/telnet/Makefile | 4 ++-- usr.bin/tn3270/tn3270/Makefile | 6 ++---- usr.sbin/apm/Makefile | 3 +-- usr.sbin/apmd/Makefile | 4 +--- usr.sbin/pppd/Makefile | 4 +--- usr.sbin/rpc.pcnfsd/Makefile | 2 -- 20 files changed, 28 insertions(+), 54 deletions(-) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index e5f2060c144..bd7031709a1 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,13 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 1996/06/23 14:19:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 1997/03/26 00:33:39 deraadt Exp $ # $NetBSD: Makefile,v 1.24 1995/03/21 09:04:30 cgd Exp $ PROG= ed CFLAGS+=-DBACKWARDS -DDES SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} - #LINKS= ${BINDIR}/ed ${BINDIR}/red #MLINKS= ed.1 red.1 diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index bb991bd8dc8..f2f242fcd42 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1997/02/06 23:49:10 rahnds Exp $ +# $OpenBSD: Makefile,v 1.9 1997/03/26 00:34:34 deraadt Exp $ # $NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 @@ -13,9 +13,6 @@ MAN= ftpd.8 CLEANFILES+=ftpcmd.c y.tab.h .PATH: ${.CURDIR}/../../usr.bin/ftp -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} - .include .if defined(SKEY) diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile index 0296aab52a7..31fd9cc2060 100644 --- a/libexec/rexecd/Makefile +++ b/libexec/rexecd/Makefile @@ -1,9 +1,7 @@ # from: @(#)Makefile 5.3 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.2 1996/02/15 03:50:46 etheisen Exp $ +# $Id: Makefile,v 1.3 1997/03/26 00:34:36 deraadt Exp $ PROG= rexecd MAN= rexecd.8 -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} .include diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 61a56aa8ff0..5d04c5c1193 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1996/03/28 23:21:53 niklas Exp $ +# $OpenBSD: Makefile,v 1.3 1997/03/26 00:34:38 deraadt Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $ @@ -7,7 +7,7 @@ CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS CFLAGS+=-DOLD_ENVIRON -DENV_HACK -I${.CURDIR} SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c -DPADD= ${LIBUTIL} ${LIBTERM} +DPADD= ${LIBUTIL} ${LIBTERM} ${LIBTELNET} LDADD+= -lutil -ltermcap -ltelnet MAN= telnetd.8 diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile index 60379971b46..af8311bb217 100644 --- a/libexec/uucpd/Makefile +++ b/libexec/uucpd/Makefile @@ -1,10 +1,8 @@ # from: @(#)Makefile 5.3 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.2 1996/02/15 03:50:49 etheisen Exp $ +# $Id: Makefile,v 1.3 1997/03/26 00:34:39 deraadt Exp $ CFLAGS+= -DBSDINETD PROG= uucpd NOMAN= noman -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} .include diff --git a/sbin/edlabel/Makefile b/sbin/edlabel/Makefile index 125a9f09fb5..30f10d457cf 100644 --- a/sbin/edlabel/Makefile +++ b/sbin/edlabel/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.3 1996/07/27 10:28:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1997/03/26 00:34:44 deraadt Exp $ # $NetBSD: Makefile,v 1.1.1.1.6.1 1996/06/28 17:42:49 jtc Exp $ # edlabel (Edit Disk LABEL) PROG= edlabel NOMAN= -CFLAGS += -Wall -LDADD += -lutil +CFLAGS+= -Wall +LDADD+= -lutil +DPADD+= ${LIBUTIL} all: ${PROG} diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 34fa0542f73..821b1a696e0 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.11 1997/02/26 03:55:16 downsj Exp $ +# $OpenBSD: bsd.prog.mk,v 1.12 1997/03/26 00:34:54 deraadt Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -37,6 +37,7 @@ LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a +LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a LIBTERMLIB?= ${DESTDIR}/usr/lib/libtermlib.a LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 2df00ea7eab..f34f105aee6 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 1997/03/21 20:59:26 millert Exp $ +# $OpenBSD: Makefile,v 1.8 1997/03/26 00:35:23 deraadt Exp $ # $NetBSD: Makefile,v 1.10 1997/03/14 01:39:31 christos Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/3/94 @@ -10,5 +10,6 @@ SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \ stringlist.c util.c LDADD+= -ledit -ltermcap +DPADD+= ${LIBEDIT} ${LIBTERMCAP} .include diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile index ed29ac966eb..d49d575d4d9 100644 --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 1996/06/26 05:35:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 1997/03/26 00:35:27 deraadt Exp $ PROG= lock BINOWN= root BINMODE=4555 -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} .include diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 5de5e631749..07e00167837 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 1996/11/09 20:17:14 millert Exp $ +# $OpenBSD: Makefile,v 1.8 1997/03/26 00:35:29 deraadt Exp $ # $NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $ PROG= login SRCS= login.c failedlogin.c -#LDADD= -lutil -lcrypt LDADD= -lutil -#DPADD= ${LIBUTIL} ${LIBCRYPT} DPADD= ${LIBUTIL} .include # For SKEY, KERBEROS and KERBEROS5 diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 06f02b88a24..5ee6cddcd11 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 1997/02/14 23:27:25 provos Exp $ +# $OpenBSD: Makefile,v 1.13 1997/03/26 00:35:32 deraadt Exp $ .include PROG= passwd SRCS= local_passwd.c yp_passwd.c passwd.c getpwent.c pwd_gensalt.c .PATH: ${.CURDIR}/../../lib/libc/gen -DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL} +DPADD+= ${LIBRPCSVC} ${LIBUTIL} LDADD+= -lrpcsvc -lutil CFLAGS+= -I${.CURDIR} diff --git a/usr.bin/skeyinit/Makefile b/usr.bin/skeyinit/Makefile index 18d8ae82f41..52945ae4455 100644 --- a/usr.bin/skeyinit/Makefile +++ b/usr.bin/skeyinit/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 1996/09/27 15:49:03 millert Exp $ +# $OpenBSD: Makefile,v 1.5 1997/03/26 00:35:35 deraadt Exp $ PROG= skeyinit BINOWN=root BINMODE=4555 -#DPADD= ${LIBCRYPT} ${LIBSKEY} DPADD= ${LIBSKEY} -#LDADD= -lcrypt -lskey LDADD= -lskey .include diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index 75d457cb02c..8704c084359 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 1996/06/26 05:39:33 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 1997/03/26 00:35:37 deraadt Exp $ PROG= su BINOWN= root BINMODE=4555 -#LDADD+= -lcrypt -#DPADD+= ${LIBCRYPT} .include diff --git a/usr.bin/sup/supfilesrv/Makefile b/usr.bin/sup/supfilesrv/Makefile index d488cb0a106..4c7c8523a98 100644 --- a/usr.bin/sup/supfilesrv/Makefile +++ b/usr.bin/sup/supfilesrv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1996/07/29 04:56:25 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 1997/03/26 00:35:38 deraadt Exp $ PROG= supfilesrv MAN= supservers.8 @@ -7,9 +7,7 @@ MLINKS+=supservers.8 supscan.8 SRCS= supfilesrv.c scan.c scm.c scmio.c stree.c log.c supmsg.c \ atoo.c errmsg.c expand.c ffilecopy.c filecopy.c nxtarg.c \ path.c quit.c run.c salloc.c skipto.c vprintf.c netcryptvoid.c -#LDADD+= -lutil -lcrypt LDADD+= -lutil -#DPADD+= ${LIBUTIL} ${LIBCRYPT} DPADD+= ${LIBUTIL} BINOWN= root BINGRP= daemon diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index ebd3256d11c..ddc3992de6d 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1996/09/05 09:10:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1997/03/26 00:35:39 deraadt Exp $ # $NetBSD: Makefile,v 1.6 1996/02/28 21:03:49 thorpej Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -41,7 +41,7 @@ CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix CFLAGS+=-DENV_HACK CFLAGS+=-I${.CURDIR}/../../lib LDADD+= -ltermcap -ltelnet -DPADD= ${LIBTERMCAP} +DPADD= ${LIBTERMCAP} ${LIBTELNET} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index feb640a52d4..78da6f1f5e2 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 1996/06/26 05:41:33 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 1997/03/26 00:35:41 deraadt Exp $ .include "../../Makefile.inc" CFLAGS += -I${.CURDIR} -I. -#LDADD += -locurses -ltermcap -ltelnet -lcrypt LDADD += -locurses -ltermcap -ltelnet -#DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a ${LIBCRYPT} -DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a +DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} ${LIBTELNET} SRCS += apilib.c api_bsd.c api_exch.c asc_ebc.c astosc.c dctype.c SRCS += disp_asc.c ebc_disp.c diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index 9feedc09739..9354fce3121 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,7 +1,6 @@ -# $Id: Makefile,v 1.2 1996/11/14 15:04:51 mickey Exp $ +# $Id: Makefile,v 1.3 1997/03/26 00:35:49 deraadt Exp $ SRCS= apm.c apmsubr.c -#LDADD+= -lutil .PATH: ${.CURDIR}/../apmd diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index 7b8f69640c6..46832572883 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,11 +1,9 @@ -# $Id: Makefile,v 1.1 1996/04/29 13:08:42 hvozda Exp $ +# $Id: Makefile,v 1.2 1997/03/26 00:35:50 deraadt Exp $ SRCS= apmd.c apmsubr.c -#LDADD+= -lutil CFLAGS+= -g -O2 -Wmissing-prototypes -Wall PROG= apmd MAN= apmd.8 .include -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 9c697d00f4a..2dcdccd2c6a 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1996/12/23 13:22:36 mickey Exp $ +# $OpenBSD: Makefile,v 1.9 1997/03/26 00:35:57 deraadt Exp $ # $NetBSD: Makefile,v 1.12 1996/03/19 03:03:04 jtc Exp $ PROG= pppd @@ -11,9 +11,7 @@ SUBDIR= pppstats chat BINMODE=4555 BINOWN= root -#LDADD= -lcrypt -lutil LDADD= -lutil -#DPADD= ${LIBCRYPT} ${LIBUTIL} DPADD= ${LIBUTIL} CFLAGS+= -I. -I${.CURDIR} -DHAVE_PATHS_H -DIPX_CHANGE CLEANFILES=y.tab.h grammar.c scanner.c diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile index c658251d5d1..c081d9ab227 100644 --- a/usr.sbin/rpc.pcnfsd/Makefile +++ b/usr.sbin/rpc.pcnfsd/Makefile @@ -14,9 +14,7 @@ CFLAGS+=-DUSE_YP SRCS= pcnfsd_v1.c pcnfsd_v2.c pcnfsd_misc.c \ pcnfsd_cache.c pcnfsd_print.c pcnfsd_svc.c pcnfsd_xdr.c -#DPADD= ${LIBRPCSVC} ${LIBCRYPT} DPADD= ${LIBRPCSVC} -#LDADD= -lrpcsvc -lcrypt LDADD= -lrpcsvc pcnfsd_svc.c: pcnfsd.x -- 2.20.1