diff options
| author | thorpej <thorpej@NetBSD.org> | 1999-07-12 22:04:09 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1999-07-12 22:04:09 +0000 |
| commit | a3281f72498769b7bf1e7007aaa653b5d26df9d0 (patch) | |
| tree | 5831d0feb22a89ac038fbe1499e487a0445d9af0 /libexec | |
| parent | dfa5aad003b0dca0a13d0c2452c88d12cf54efa7 (diff) | |
Use bsd.crypto.mk.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/Makefile | 9 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 26 |
2 files changed, 17 insertions, 18 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 917e6a85d2e..dd810611980 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.33 1999/07/02 05:52:14 itojun Exp $ +# $NetBSD: Makefile,v 1.34 1999/07/12 22:06:03 thorpej Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 +SRCTOP= ../.. +.include <bsd.crypto.mk> + PROG= ftpd SRCS= conf.c ftpd.c ftpcmd.y logwtmp.c popen.c CPPFLAGS+=-DHASSETPROCTITLE @@ -22,4 +25,8 @@ DPADD+= ${LIBSKEY} LDADD+= -lskey .endif +.if defined(CRYPTOPATH) +.include "${CRYPTOPATH}/libexec/ftpd/Makefile.frag" +.endif + .include <bsd.prog.mk> diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index b525cce447c..605ee1a5bea 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,33 +1,25 @@ -# $NetBSD: Makefile,v 1.20 1999/07/02 06:32:08 itojun Exp $ +# $NetBSD: Makefile,v 1.21 1999/07/12 22:06:03 thorpej Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 -.include <bsd.own.mk> # for EXPORTABLE_SYSTEM definition +SRCTOP= ../.. +.include <bsd.crypto.mk> MAN= telnetd.8 CPPFLAGS+=-DINET6 -# XXX Keep telnetd(8) and libtelnet from getting out of sync during the build -# XXX process. -.if (!exists(${.CURDIR}/../../domestic/libexec/telnetd) && \ - !exists(${.CURDIR}/../../crypto-us/libexec/telnetd)) || \ - defined(EXPORTABLE_SYSTEM) || \ - make (obj) || make(clean) || make(cleandir) || make(distclean) - PROG= telnetd CPPFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOPENPTY_PTY -CPPFLAGS+=-DOLD_ENVIRON -DENV_HACK -DSECURELOGIN -I${.CURDIR} -#CPPFLAGS+=-DAUTHENTICATION -I${.CURDIR}/../../lib +CPPFLAGS+=-DOLD_ENVIRON -DENV_HACK -DSECURELOGIN SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD+= -lutil -ltermcap -ltelnet -.include <bsd.prog.mk> +.if defined(CRYPTOPATH) +.include "${CRYPTOPATH}/libexec/telnetd/Makefile.frag" +.endif -.else # EXPORTABLE_SYSTEM -.include <bsd.man.mk> -.endif # EXPORTABLE_SYSTEM +CPPFLAGS+=-I${.CURDIR} -nocrypt: - @echo "Encryption code already removed." +.include <bsd.prog.mk> |
