diff options
author | marcel <marcel@FreeBSD.org> | 1999-11-23 18:52:12 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 1999-11-23 18:52:12 +0000 |
commit | 3765f3c475ecd80158ab92b547ab32ef506a1707 (patch) | |
tree | ce47cbcc3425a03051065cfd4d753b34883679d9 | |
parent | fca91f81f00e6ab7eb4b107c4ce71ad232a3f5f2 (diff) | |
download | FreeBSD-src-3765f3c475ecd80158ab92b547ab32ef506a1707.zip FreeBSD-src-3765f3c475ecd80158ab92b547ab32ef506a1707.tar.gz |
Fix some bugs and make some policy changes.
o Send libmytinfo back to the afterlife. It was revived by mistake,
o Make gnu/lib/libgcc before making lib/libpam. This dependency has
been overlooked in constructing the list,
o make depend before make all. It's by using make depend that the
dependency was found in the first place and we need it to prevent
cleaning everything up before we start,
o Don't specify -DNOINFO -DNOMAN for the libraries target. Let the
target handle it. We can do away with a single run over the libs
if we make everything while we're there and only install the
libraries in the object tree.
-rw-r--r-- | Makefile.inc1 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 220bd3c..6bf805f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -311,7 +311,7 @@ buildworld: check-objformat @echo "--------------------------------------------------------------" @echo ">>> Building ${OBJFORMAT} libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${XMAKE} -DNOINFO -DNOMAN -f Makefile.inc1 libraries + cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 libraries @echo @echo "--------------------------------------------------------------" @echo ">>> Building everything.." @@ -625,7 +625,7 @@ lib-tools: # # gnu/lib: lib/libm lib/libmytinfo lib/libncurses # kerberosIV/lib: lib/libcrypt -# lib/libpam: secure/lib/libdes kerberosIV/lib/libkrb +# lib/libpam: secure/lib/libdes kerberosIV/lib/libkrb gnu/lib/libgcc # secure/lib: lib/libmd # .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) @@ -656,11 +656,14 @@ _libperl= gnu/usr.bin/perl/libperl libraries: .for _lib in ${_csu} lib/libmd lib/libcrypt ${_secure_lib} ${_kerberosIV_lib} \ - lib/libcom_err ${_libm} lib/libmytinfo lib/libncurses lib/libradius \ + gnu/lib/libgcc lib/libcom_err ${_libm} lib/libncurses lib/libradius \ lib/libskey lib/libtacplus lib/libutil lib gnu/lib ${_libperl} \ usr.bin/lex/lib usr.sbin/pcvt/keycap .if exists(${.CURDIR}/${_lib}) - cd ${.CURDIR}/${_lib}; ${MAKE} all; ${MAKE} -B install + cd ${.CURDIR}/${_lib}; \ + ${MAKE} depend; \ + ${MAKE} all; \ + ${MAKE} -DNOINFO -DNOMAN install; .endif .endfor |