BINFORMAT -> OBJFORMAT ready for E-day.

This commit is contained in:
John Birrell 1998-08-30 01:57:55 +00:00
parent a804ec2201
commit 8deb7ff0b0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38632
7 changed files with 17 additions and 19 deletions

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.17 1998/05/15 06:42:01 jb Exp $
# $Id: Makefile,v 1.18 1998/05/24 21:51:50 eivind Exp $
#
LIB= gmp
@ -96,7 +96,7 @@ SRCS+=$(_src)
SRCS+= ${MPZ_SRCS} ${MPF_SRCS} ${MPQ_SRCS}
.if defined(BINFORMAT) && ${BINFORMAT} == elf
.if defined(OBJFORMAT) && ${OBJFORMAT} == elf
sysdep.h: ${GMPDIR}/mpn/sysv.h
cp ${GMPDIR}/mpn/sysv.h sysdep.h

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.14 1998/03/12 13:03:06 bde Exp $
# $Id: Makefile,v 1.15 1998/05/15 06:42:37 jb Exp $
#
LIB= mp
@ -62,7 +62,7 @@ SRCS+= ${MPBSD_SRCS}
beforedepend all: mpz
.if defined(BINFORMAT) && ${BINFORMAT} == elf
.if defined(OBJFORMAT) && ${OBJFORMAT} == elf
sysdep.h: ${GMPDIR}/mpn/sysv.h
cp ${GMPDIR}/mpn/sysv.h sysdep.h

View File

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

View File

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

View File

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

View File

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

View File

@ -1,9 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $Id: Makefile,v 1.32 1998/06/12 19:45:14 peter Exp $
# $Id: Makefile,v 1.33 1998/08/04 15:32:43 peter Exp $
SUBDIR= atrun bootpd comsat fingerd ftpd getNAME getty \
makekey mknetid revnetgroup rexecd rlogind \
rpc.rquotad \
rpc.rquotad rpc.rstatd \
rpc.rusersd rpc.rwalld rpc.sprayd rshd talkd tftpd uucpd \
xtend ypxfr
@ -12,11 +12,11 @@ SUBDIR+=mail.local smrsh
.endif
.if ${MACHINE} == i386
SUBDIR+=named-xfer rpc.rstatd
.if ${BINFORMAT} == aout
SUBDIR+=named-xfer
.if ${OBJFORMAT} == aout
SUBDIR+=rtld-aout
.endif
.if ${BINFORMAT} == elf
.if ${OBJFORMAT} == elf
SUBDIR+=rtld-elf
.endif
.endif