From b03b5de644b90871d24090fcd20d141fdbc8827e Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Sat, 16 Sep 1995 03:13:38 +0000 Subject: Merge with Head: Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries. This makes secure reference the libraries that were just built instead of in /usr/lib. --- secure/libexec/Makefile.inc | 4 +++- secure/libexec/telnetd/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'secure/libexec') diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index 6657676abc6f..26d868c39153 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id: Makefile,v 1.2 1995/07/25 14:03:35 mark Exp $ +# $Id: Makefile.inc,v 1.2 1995/07/29 12:49:22 markm Exp $ BINDIR?= /usr/libexec + +.include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 977271d6ec2f..0bd111c5b9f6 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -9,8 +9,8 @@ MAN8= telnetd.8 SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} -LDADD= -lutil -ltermcap -ltelnet +DPADD= ${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP} +LDADD= -L${TELNETOBJDIR} -lutil -ltermcap -ltelnet CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK CFLAGS+=-I${.CURDIR}/../../lib -- cgit v1.3