Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.206.2.1 retrieving revision 1.207 diff -u -p -r1.206.2.1 -r1.207 --- src/share/mk/bsd.prog.mk 2006/04/17 23:11:11 1.206.2.1 +++ src/share/mk/bsd.prog.mk 2005/04/09 13:00:53 1.207 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.206.2.1 2006/04/17 23:11:11 tron Exp $ +# $NetBSD: bsd.prog.mk,v 1.207 2005/04/09 13:00:53 dsl Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -75,21 +75,8 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_ # PAM applications, if linked statically, need more libraries .if (${MKPIC} == "no") -.if (${MKCRYPTO} != "no") -PAM_STATIC_LDADD+= -lssh -PAM_STATIC_DPADD+= ${LIBSSH} -.endif -.if (${MKKERBEROS} != "no") -PAM_STATIC_LDADD+= -lkafs -lkrb -lkrb5 -lasn1 -lroken -lcom_err -lcrypto -PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB} ${LIBKRB5} ${LIBASN1} ${LIBROKEN} \ - ${LIBCOM_ERR} ${LIBCRYPTO} -.endif -.if (${MKSKEY} != "no") -PAM_STATIC_LDADD+= -lskey -PAM_STATIC_DPADD+= ${LIBSKEY} -.endif -PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil -PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} +PAM_STATIC_LDADD= -lcrypt -lrpcsvc -lutil +PAM_STATIC_DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} .else PAM_STATIC_LDADD= PAM_STATIC_DPADD= @@ -205,6 +192,7 @@ ${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${L .endif # !commands(${PROG}) ${PROG}.ro: ${OBJS} ${DPADD} + ${_MKTARGET_LINK} ${LD} -r -dc -o ${.TARGET} ${OBJS} .endif # defined(OBJS) && !empty(OBJS)