diff options
author | markm <markm@FreeBSD.org> | 2000-02-24 23:03:16 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-02-24 23:03:16 +0000 |
commit | eb2f1b4a7cabffc6afb1972680f4027374993a3d (patch) | |
tree | 105813e974524c2bc79ceac9b70e63dab6daa529 | |
parent | 60d4791e244d788bcb29871ccf6ed170542c0fe5 (diff) | |
download | FreeBSD-src-eb2f1b4a7cabffc6afb1972680f4027374993a3d.zip FreeBSD-src-eb2f1b4a7cabffc6afb1972680f4027374993a3d.tar.gz |
We have a new world order in libraries.
Goodbye libdes; Welcome libcrypto.
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | Makefile.inc1 | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -82,8 +82,8 @@ # TGTS= afterdistribute all buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute everything hierarchy includes \ - install installkernel installmost installworld lint maninstall mk \ - most obj objlink regress rerelease tags update + install installkernel installmost installworld libraries lint \ + maninstall mk most obj objlink regress rerelease tags update PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 diff --git a/Makefile.inc1 b/Makefile.inc1 index 867d2cc..c469a69 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -585,7 +585,6 @@ includes: .if exists(${.CURDIR}/secure/lib/libcrypto) cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall .endif - cd ${.CURDIR}/secure/lib/libdes; ${MAKE} beforeinstall .if exists(${.CURDIR}/secure/lib/libssl) cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall .endif @@ -660,8 +659,8 @@ includes: # libg++: libm # libkrb: libcrypt # libopie: libmd -# libpam: libcom_err libcrypt libdes libgcc_pic libkrb libradius libskey \ -# libtacplus libutil +# libpam: libcom_err libcrypt libcrypto libgcc_pic libkrb libradius libskey \ +# libtacplus libutil libz libssh # libradius: libmd # libreadline: libncurses # libskey: libcrypt libmd @@ -673,7 +672,8 @@ includes: # # gnu/lib: lib/libm lib/libncurses # kerberosIV/lib kerberos5/lib: lib/libcrypt -# lib/libpam: secure/lib/libdes kerberosIV/lib/libkrb gnu/lib/libgcc +# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb gnu/lib/libgcc \ +# secure/lib/libssh lib/libz # secure/lib: lib/libmd # .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) @@ -713,7 +713,7 @@ _libkeycap= usr.sbin/pcvt/keycap libraries: .for _lib in ${_csu} lib/libmd lib/libcrypt ${_secure_lib} ${_kerberosIV_lib} \ ${_kerberos5_lib} gnu/lib/libgcc lib/libcom_err ${_libm} lib/libncurses \ - lib/libradius lib/libskey lib/libtacplus lib/libutil lib gnu/lib \ + lib/libradius lib/libskey lib/libtacplus lib/libutil lib/libz lib gnu/lib \ ${_libperl} usr.bin/lex/lib ${_libkeycap} .if exists(${.CURDIR}/${_lib}) cd ${.CURDIR}/${_lib}; \ |