diff options
author | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-03-26 14:53:33 +0000 |
commit | ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4 (patch) | |
tree | 0db60fb94584b564904c50e18e3ff4f05eb4cdcb /secure/lib/libssh | |
parent | 0c5874752b9906c2928c57de2a78a6a5fb277673 (diff) | |
download | FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.zip FreeBSD-src-ffbd5f978d5e034c5c1c8c018f77afcc43eba8d4.tar.gz |
secure/ build fixes:
- TELNETOBJDIR is gone. `buildworld' already installs libtelnet.a
in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.
- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
New LIBSSH is introduced for libssh.a (an internal static lib).
Previously, build without prior `obj' was broken; SSH modules
always looked for libssh.a in ${.OBJDIR}. Also, the dependancies
on the libssh.a were missing.
- libtelnet/ did not install the crypto version of telnet.h into
/usr/include/arpa.
- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.
Reviewed by: markm
- MAN[1-9] -> MAN.
Diffstat (limited to 'secure/lib/libssh')
-rw-r--r-- | secure/lib/libssh/Makefile | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index f13800b..f10d110 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ # -SSHSRC= ${.CURDIR}/../../../crypto/openssh - LIB= ssh SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ cipher.c compat.c compress.c crc32.c deattack.c \ @@ -11,19 +9,14 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \ cli.c rijndael.c -NOPIC= yes - -install: +NOPIC= yes +INTERNALLIB= yes +INTERNALSTATICLIB= yes .if defined(COMPAT_GETADDRINFO) SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c .endif -.include <bsd.own.mk> - -.PATH: ${SSHSRC} -.PATH: ${SSHSRC}/lib - .if defined(MAKE_KERBEROS4) && \ ((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES")) CFLAGS+= -DKRB4 @@ -38,4 +31,7 @@ CFLAGS+= -DSKEY DPADD+= ${LIBOPIE} LDADD+= -lopie SRCS+= auth-skey.c auth2-skey.c + .include <bsd.lib.mk> + +.PATH: ${SSHDIR} ${SSHDIR}/lib |