d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of unsed since rev 1.109 of lib/Makefile WANT_CSRG_LIBM define.

Browse Source 
Also replace internal make variable _libm with hardcoded path to lib/msun

Reviewed by:	bde
This commit is contained in:
phantom 2001-12-11 16:10:26 +00:00
parent 43b8ed47bd
commit 1fef6a00e6
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.inc1
View File

@ -696,9 +696,7 @@ includes:
cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall
.if !defined(WANT_CSRG_LIBM)
cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall
.endif
cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall
@ -729,19 +727,19 @@ includes:
# libdevstat: libkvm
# libdialog: libncurses
# libedit: libncurses
# libg++: libm
# libg++: msun
# libkrb: libcrypt
# libopie: libmd
# libpam: libcom_err libcrypt libcrypto libkrb libopie libradius \
# librpcsvc libtacplus libutil libz libssh
# libradius: libmd
# libreadline: libncurses
# libstc++: libm
# libstc++: msun
# libtacplus: libmd
#
# Across directories this comes down to (rougly):
#
# gnu/lib: lib/libm lib/libncurses
# gnu/lib: lib/msun lib/libncurses
# kerberosIV/lib kerberos5/lib: lib/libcrypt
# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \
# secure/lib/libssh lib/libz
@ -767,12 +765,6 @@ _kerberosIV_lib= kerberosIV/lib
_kerberos5_lib= kerberos5/lib
.endif
.if defined(WANT_CSRG_LIBM)
_libm= lib/libm
.else
_libm= lib/msun
.endif
.if ${MACHINE_ARCH} == "i386"
_libkeycap= usr.sbin/pcvt/keycap
.endif
@ -784,7 +776,7 @@ _libperl= gnu/usr.bin/perl/libperl
libraries:
.for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \
${_secure_lib} ${_kerberosIV_lib} \
${_kerberos5_lib} lib/libcom_err lib/libkvm ${_libm} lib/libncurses \
${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \
lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \
lib/libutil lib/libz lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap}
.if exists(${.CURDIR}/${_lib})