Removed the a.out compatibility cruft.

libgnumalloc.so.2 and libresolv.so.2 should be put under
lib/compat/compat2?/ but I don't have the 2.x releases.

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 6645281..c5d1fac 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,10 +25,10 @@ SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd \
 	libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \
+	libedit libfetch libform libftpio ${_libio} libipsec \
 	libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
-	${_libresolv} ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
+	${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
 	libstand ${_libtelnet} libusbhid ${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@@ -39,11 +39,6 @@ _csu=csu/${MACHINE_ARCH}
 _csu=csu
 .endif
 
-.if ${OBJFORMAT} == "aout" && ${MACHINE_ARCH} == "i386"
-_libgnumalloc=	libgnumalloc
-_libresolv=	libresolv
-.endif
-
 .if !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64
 _libc_r=	libc_r
 .endif