From dcb2279368aba1f487a3cbfe7312f93f89876bc9 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 6 Nov 2002 22:54:58 +0000 Subject: [PATCH] Style sync with rest of FreeBSD. --- secure/lib/libcipher/Makefile | 10 ++++------ secure/lib/libcrypto/Makefile | 31 +++++++++++++++---------------- secure/lib/libcrypto/Makefile.asm | 17 +++++++---------- secure/lib/libcrypto/Makefile.inc | 2 +- secure/lib/libssh/Makefile | 24 +++++++++++------------- secure/lib/libtelnet/Makefile | 19 ++++++++----------- 6 files changed, 46 insertions(+), 57 deletions(-) diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile index 3074daba5186..d0de0b420296 100644 --- a/secure/lib/libcipher/Makefile +++ b/secure/lib/libcipher/Makefile @@ -1,16 +1,14 @@ -# # $FreeBSD$ -# -LIB= cipher -SRCS= crypt.c +LIB= cipher +SRCS= crypt.c PRECIOUSLIB= yes #NOPROFILE= yes MAN= cipher.3 -MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3 +MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3 MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3 -#SUBDIR= test +#SUBDIR= test .include diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index f351b1a4cbc3..38f5a08d5a49 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -2,26 +2,26 @@ .include "Makefile.inc" -.PATH: ${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \ - ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/buffer \ - ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/conf \ - ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/dsa \ - ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp \ - ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 \ - ${LCRYPTO_SRC}/md4 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/mdc2 \ - ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/pkcs7 \ - ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/rc2 \ - ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/ripemd \ - ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref ${LCRYPTO_SRC}/sha \ - ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/x509 \ - ${LCRYPTO_SRC}/x509v3 ${.CURDIR}/man +.PATH: ${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \ + ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/buffer \ + ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/conf \ + ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/dsa \ + ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp \ + ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 \ + ${LCRYPTO_SRC}/md4 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/mdc2 \ + ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/pkcs7 \ + ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/rc2 \ + ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/ripemd \ + ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref ${LCRYPTO_SRC}/sha \ + ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/x509 \ + ${LCRYPTO_SRC}/x509v3 ${.CURDIR}/man .if ${MACHINE_ARCH} == "i386" -.PATH: ${.CURDIR}/i386 +.PATH: ${.CURDIR}/i386 .endif .if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES -.PATH: ${LCRYPTO_SRC}/idea +.PATH: ${LCRYPTO_SRC}/idea .endif LIB= crypto @@ -36,7 +36,6 @@ SRCS+= cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_dbg.c \ tmdiff.c uid.c # asn1 - SRCS+= a_bitstr.c a_bmp.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \ a_dup.c a_enum.c a_gentm.c a_hdr.c a_i2d_fp.c a_int.c \ a_mbstr.c a_meth.c a_null.c a_object.c a_octet.c a_print.c \ diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index f0b0ebcfe1bc..925e9b1f6ea7 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -8,18 +8,16 @@ .include "Makefile.inc" -.PATH: ${LCRYPTO_SRC}/rc4/asm ${LCRYPTO_SRC}/rc5/asm \ - ${LCRYPTO_SRC}/des/asm ${LCRYPTO_SRC}/cast/asm \ - ${LCRYPTO_SRC}/sha/asm ${LCRYPTO_SRC}/bn/asm \ - ${LCRYPTO_SRC}/bf/asm ${LCRYPTO_SRC}/md5/asm \ - ${LCRYPTO_SRC}/ripemd/asm +.PATH: ${LCRYPTO_SRC}/rc4/asm ${LCRYPTO_SRC}/rc5/asm \ + ${LCRYPTO_SRC}/des/asm ${LCRYPTO_SRC}/cast/asm \ + ${LCRYPTO_SRC}/sha/asm ${LCRYPTO_SRC}/bn/asm \ + ${LCRYPTO_SRC}/bf/asm ${LCRYPTO_SRC}/md5/asm \ + ${LCRYPTO_SRC}/ripemd/asm + PERLPATH= ${LCRYPTO_SRC}/des/asm:${LCRYPTO_SRC}/perlasm -SRCS= - # blowfish -SRCS+= bf-686.pl -SRCS+= bf-586.pl +SRCS= bf-686.pl bf-586.pl # bn SRCS+= bn-586.pl co-586.pl @@ -58,6 +56,5 @@ CLEANFILES+= ${SRCS:M*.pl:S/.pl$/.cmt/} ${SRCS:M*.pl:S/.pl$/.s/} .cmt.s: tr -d "'" < ${.IMPSRC} > ${.TARGET} - .include .endif diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 5891d3a3b71c..69ca8ccadc96 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,7 +1,7 @@ # $FreeBSD$ LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto -CFLAGS+= -DTERMIOS -DANSI_SOURCE -I${LCRYPTO_SRC} -I${.OBJDIR} +CFLAGS+= -DTERMIOS -DANSI_SOURCE -nostdinc -I${LCRYPTO_SRC} -I${.OBJDIR} -I/usr/include .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES CFLAGS+= -DNO_IDEA .endif diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 8e037119719d..c9311a50deaf 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,5 +1,4 @@ # $FreeBSD$ -# LIB= ssh SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ @@ -13,25 +12,24 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ SRCS+= bsd-misc.c entropy.c # FreeBSD additions SRCS+= version.c -CFLAGS+=-I${SSHDIR} - -NOLINT= true - -.if defined(MAKE_KERBEROS4) -CFLAGS+= -DKRB4 -.endif - -.if defined(MAKE_KERBEROS5) -CFLAGS+= -DKRB5 -DHEIMDAL -.endif .if defined(COMPAT_GETADDRINFO) SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c .endif +CFLAGS+= -I${SSHDIR} +.if defined(MAKE_KERBEROS4) +CFLAGS+= -DKRB4 +.endif +.if defined(MAKE_KERBEROS5) +CFLAGS+= -DKRB5 -DHEIMDAL +.endif + +NOLINT= true + DPADD= ${LIBCRYPTO} ${LIBZ} LDADD= -lcrypto -lz .include -.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat +.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 102be59108e4..67d5d474c65e 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -1,19 +1,16 @@ -# $FreeBSD$ - -LIB= telnet +# $FreeBSD$ +LIB= telnet INTERNALLIB= yes -SRCS= genget.c getent.c misc.c encrypt.c auth.c \ - enc_des.c sra.c pk.c +SRCS= genget.c getent.c misc.c encrypt.c auth.c enc_des.c sra.c pk.c -CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ - -I${TELNETDIR} -I${TELNETDIR}/libtelnet +WARNS?= 2 +CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ + -I${TELNETDIR} -I${TELNETDIR}/libtelnet -WARNS?= 2 - -INCS= ${TELNETDIR}/arpa/telnet.h -INCSDIR= ${INCLUDEDIR}/arpa +INCS= ${TELNETDIR}/arpa/telnet.h +INCSDIR=${INCLUDEDIR}/arpa .include