From e6edac6dacf20f8ae61584889afeaa2545b227ea Mon Sep 17 00:00:00 2001
From: jb <jb@FreeBSD.org>
Date: Sun, 30 Aug 1998 01:57:55 +0000
Subject: BINFORMAT -> OBJFORMAT ready for E-day.

---
 lib/Makefile          | 6 +++---
 lib/libcrypt/Makefile | 4 ++--
 lib/libmd/Makefile    | 4 ++--
 lib/libskey/Makefile  | 4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile b/lib/Makefile
index 01bfaa9..87c0079 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.72 1998/08/20 08:24:07 msmith Exp $
+#	$Id: Makefile,v 1.73 1998/08/22 14:31:39 gpalmer Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -19,8 +19,8 @@ SUBDIR=	libcom_err ${_libcrypt} ${_libm} libmytinfo libtermcap \
 	libpcap libresolv librpcsvc ${_libscsi} libskey libss libstand \
 	${_libtcl} ${_libtelnet} libutil ${_libvgl} libxpg4 liby libz
 
-.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${BINFORMAT})
-_csu=csu/${MACHINE_ARCH}-${BINFORMAT}
+.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
+_csu=csu/${MACHINE_ARCH}-${OBJFORMAT}
 .elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
 _csu=csu/${MACHINE_ARCH}
 .endif
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index afe4c0c..36bf6e8 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.10 1997/09/05 12:12:35 peter Exp $
+# $Id: Makefile,v 1.11 1998/05/28 12:52:03 peter Exp $
 #
 
 LCRYPTBASE= 	libcrypt
@@ -19,7 +19,7 @@ LIB=	scrypt
 SRCS=	crypt.c md5c.c
 CFLAGS+=	-I${.CURDIR}/../libmd -DLIBC_SCCS
 
-.if ${BINFORMAT} == elf
+.if ${OBJFORMAT} == elf
 SONAME=	${LCRYPTBASE}.so.${SHLIB_MAJOR}
 .endif
 
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index 96c2d0a..3ed3d55 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.24 1997/09/05 11:49:43 peter Exp $
+#	$Id: Makefile,v 1.25 1998/03/19 15:27:08 bde Exp $
 
 LIB=	md
-.if ${BINFORMAT} != elf
+.if ${OBJFORMAT} != elf
 NOPIC=	true
 .endif
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index 424f4d1..25f99fe 100644
--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@@ -13,11 +13,9 @@ CFLAGS+=-DPERMIT_CONSOLE -D_SKEY_INTERNAL -I${.CURDIR}
 CFLAGS+=-W -Wall
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+=-Werror
-.else
-CFLAGS+=-DMD5
 .endif
 
-.if ${BINFORMAT} == elf
+.if ${OBJFORMAT} == elf
 DPADD+= ${LIBCRYPT} ${LIBMD}
 LDADD+=	-lcrypt -lmd
 .endif
-- 
cgit v1.1