1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-26 11:47:31 +00:00

Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries. This makes

secure reference the libraries that were just build instead of in /usr/lib.
This commit is contained in:
Justin T. Gibbs 1995-09-16 03:04:10 +00:00
parent 97e112628f
commit b7f41e3f67
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=10814
7 changed files with 27 additions and 11 deletions

View File

@ -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

View File

@ -38,7 +38,8 @@ PROG= telnet
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO
CFLAGS+=-DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib
LDADD+= -ltermcap -ltelnet
LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet
DPADD+= ${TELNETOBJDIR}/libtelnet.a
#ifdef ENCRYPTION

View File

@ -1,3 +1,15 @@
# $Id: Makefile.inc,v 1.5 1995/05/09 05:22:41 jkh Exp $
# $Id: Makefile.inc,v 1.6 1995/05/11 22:07:49 jkh Exp $
DISTRIBUTION=des
.if exists(${.CURDIR}/../../lib/libtelnet/obj)
TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet/obj
.else
TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet
.endif
.if exists(${.CURDIR}/../../lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj
.else
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt
.endif

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.1 1994/11/14 20:45:26 phk Exp $
# $Id: Makefile,v 1.2 1994/11/21 02:58:43 phk Exp $
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
@ -7,7 +7,7 @@ LINKS= ${BINDIR}/ed ${BINDIR}/red
NOMAN= true
CFLAGS+=-DDES
LDADD+= -L../../lib/libcrypt -ldescrypt
DPADD+= ../../lib/libcrypt/libdescrypt.a
LDADD+= -L${CRYPTOBJDIR} -ldescrypt
DPADD+= ${CRYPTOBJDIR}/libdescrypt.a
.include <bsd.prog.mk>

View File

@ -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"

View File

@ -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

View File

@ -38,7 +38,8 @@ PROG= telnet
CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO
CFLAGS+=-DENV_HACK
CFLAGS+=-I${.CURDIR}/../../lib
LDADD+= -ltermcap -ltelnet
LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet
DPADD+= ${TELNETOBJDIR}/libtelnet.a
#ifdef ENCRYPTION