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

Make sure libskey is built before libpam. It is required for one of

Browse Source 
the PAM modules.

Fix the comments describing the PAM dependencies to be consistent
with other related comments.
This commit is contained in:
John Polstra 1998-11-20 02:03:52 +00:00
parent 60da54eec3
commit 127a2cfaf4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=41258
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.inc1
View File

@ -1,5 +1,5 @@
# #
# $Id: Makefile.inc1,v 1.42 1998/11/18 00:40:38 jdp Exp $ # $Id: Makefile.inc1,v 1.43 1998/11/18 01:59:39 jdp Exp $
# #
# Make command line options: # Make command line options:
# -DCLOBBER will remove /usr/include # -DCLOBBER will remove /usr/include
@ -647,13 +647,17 @@ lib-tools:
# csu must be built before all shared libaries for ELF. # csu must be built before all shared libaries for ELF.
# libcom_err must be built before libss. # libcom_err must be built before libss.
# libcrypt must be built before libskey and libkrb. # libcrypt must be built before libskey and libkrb.
# libdes must be built before libpam.
# libkrb must be built before libpam.
# libm must be built before libf2c, libg++ and libstdc++. # libm must be built before libf2c, libg++ and libstdc++.
# libmd must be built before libatm, libopie, libradius, libskey, # libmd must be built before libatm, libopie, libradius, libskey,
# and libtacplus. # and libtacplus.
# libmytinfo must be built before libdialog and libncurses. # libmytinfo must be built before libdialog and libncurses.
# libncurses must be built before libdialog. # libncurses must be built before libdialog.
# libradius must be built before libpam.
# libskey must be built before libpam.
# libtacplus must be built before libpam.
# libtermcap must be built before libcurses, libedit and libreadline. # libtermcap must be built before libcurses, libedit and libreadline.
# libdes, libkrb, libradius and libtacplus must be built before libpam.
# #
# Some libraries are built conditionally and/or are in inconsistently # Some libraries are built conditionally and/or are in inconsistently
# named directories: # named directories:
@ -668,10 +672,15 @@ _csu=lib/csu/${MACHINE_ARCH}
.if !defined(NOSECURE) && !defined(NOCRYPT) .if !defined(NOSECURE) && !defined(NOCRYPT)
_libcrypt= secure/lib/libcrypt lib/libcrypt _libcrypt= secure/lib/libcrypt lib/libcrypt
_secure_lib= secure/lib
.else .else
_libcrypt= lib/libcrypt _libcrypt= lib/libcrypt
.endif .endif
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
_kerberosIV_lib=kerberosIV/lib
.endif
.if defined(WANT_CSRG_LIBM) .if defined(WANT_CSRG_LIBM)
_libm= lib/libm _libm= lib/libm
.else .else
@ -718,20 +727,13 @@ bootstrap-libraries:
# the prerequisites first, then build almost everything else in # the prerequisites first, then build almost everything else in
# alphabetical order. # alphabetical order.
# #
_libs= ${_csu} lib/libcom_err ${_libcrypt} ${_libm} lib/libmd \
lib/libmytinfo lib/libncurses lib/libtermcap \
lib/libradius lib/libtacplus
.if !defined(NOCRYPT) && !defined(NOSECURE)
_libs+= secure/lib
.endif
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
_libs+= kerberosIV/lib
.endif
_libs+= gnu/lib gnu/usr.bin/cc/libgcc ${_libperl} lib usr.bin/lex/lib \
usr.sbin/pcvt/keycap
libraries: libraries:
.for _lib in ${_libs} .for _lib in ${_csu} lib/libcom_err ${_libcrypt} ${_libm} lib/libmd \
lib/libmytinfo lib/libncurses lib/libtermcap \
lib/libradius lib/libskey lib/libtacplus \
${_secure_lib} ${_kerberosIV_lib} \
gnu/lib gnu/usr.bin/cc/libgcc ${_libperl} lib usr.bin/lex/lib \
usr.sbin/pcvt/keycap
.if exists(${.CURDIR}/${_lib}) .if exists(${.CURDIR}/${_lib})
cd ${.CURDIR}/${_lib}; ${MAKE} all; ${MAKE} -B install cd ${.CURDIR}/${_lib}; ${MAKE} all; ${MAKE} -B install
.endif .endif