summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--Makefile.inc110
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e3fe5c2..bad55f7 100644
--- a/Makefile
+++ b/Makefile
@@ -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}; \
OpenPOWER on IntegriCloud