summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>1998-03-08 23:24:05 +0000
committerjb <jb@FreeBSD.org>1998-03-08 23:24:05 +0000
commit05f2d83c904c326755187106e2440944ddbeab71 (patch)
tree5412ba8606a7735666e78ae021a601dc5f442a42 /lib/Makefile
parentb3bfa4c081c3590b9a33ea9445bc2d8038a87be3 (diff)
downloadFreeBSD-src-05f2d83c904c326755187106e2440944ddbeab71.zip
FreeBSD-src-05f2d83c904c326755187106e2440944ddbeab71.tar.gz
Can build libc and libc_r on alpha now.
Changed MACHINE to MACHINE_ARCH with the expectation that pc98 will use elf the same as i386. Nuked tahoe and vax 'cause the files they reference aren't in the tree. If you want vax goto NetBSD. If you want tahoe... tough.
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile30
1 files changed, 13 insertions, 17 deletions
diff --git a/lib/Makefile b/lib/Makefile
index ed466a9..082de42 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,34 +1,30 @@
+# $Id$
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-.if ${MACHINE} == "tahoe"
-SUBDIR=csu/tahoe.pcc
-.elif ${MACHINE} == "vax"
-SUBDIR=csu/vax.pcc
-.elif exists(${.CURDIR}/csu/${MACHINE}-${BINFORMAT})
-SUBDIR=csu/${MACHINE}-${BINFORMAT}
-.elif exists(${.CURDIR}/csu/${MACHINE})
-SUBDIR=csu/${MACHINE}
-.endif
-
-# Don't want to build libc on alpha just yet
-.if ${MACHINE} != "alpha"
-SUBDIR+=libc
+.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${BINFORMAT})
+SUBDIR=csu/${MACHINE_ARCH}-${BINFORMAT}
+.elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
+SUBDIR=csu/${MACHINE_ARCH}
.endif
# XXX MISSING: libplot
-SUBDIR+=libalias libcalendar libcompat libcom_err libcurses libdisk \
- libedit libf2c libftpio libgnumalloc libipx libkvm libmd libmytinfo \
+SUBDIR+=libalias libc libcalendar libcompat libcom_err libcurses \
+ libedit libf2c libftpio libgnumalloc libipx libmd libmytinfo \
libncurses libopie libpcap libresolv librpcsvc \
- libscsi libskey libss libtermcap libutil libvgl libxpg4 liby libz
+ libskey libss libtermcap libutil libxpg4 liby libz
-.if !defined(NOLIBC_R) && ${MACHINE} != "alpha"
+.if !defined(NOLIBC_R)
SUBDIR+= libc_r
.endif
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=libdisk libkvm libscsi libvgl
+
.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \
exists(${.CURDIR}/../usr.bin/tclsh) && exists (${.CURDIR}/libtcl)
SUBDIR+=libtcl
.endif
+.endif
.if !exists(${.CURDIR}/../secure) || defined(NOSECURE) || defined(NOCRYPT)
SUBDIR+= libcrypt
OpenPOWER on IntegriCloud