Mon Dec 14 01:18:20 2009 UTC ()
Merge from matt-nb5-mips64


(matt)
diff -r1.8 -r1.9 src/lib/libpam/libpam/Makefile
cvs diff -r1.8 -r1.9 src/lib/libpam/libpam/Makefile (expand / switch to unified diff)

--- src/lib/libpam/libpam/Makefile 2008/10/26 07:44:12 1.8
+++ src/lib/libpam/libpam/Makefile 2009/12/14 01:18:20 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2008/10/26 07:44:12 mrg Exp $ 1# $NetBSD: Makefile,v 1.9 2009/12/14 01:18:20 matt Exp $
2#- 2#-
3# Copyright (c) 1998 Juniper Networks, Inc. 3# Copyright (c) 1998 Juniper Networks, Inc.
4# All rights reserved. 4# All rights reserved.
5# Copyright (c) 2002 Networks Associates Technology, Inc. 5# Copyright (c) 2002 Networks Associates Technology, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Portions of this software was developed for the FreeBSD Project by 8# Portions of this software was developed for the FreeBSD Project by
9# ThinkSec AS and NAI Labs, the Security Research Division of Network 9# ThinkSec AS and NAI Labs, the Security Research Division of Network
10# Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 10# Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
11# ("CBOSS"), as part of the DARPA CHATS research program. 11# ("CBOSS"), as part of the DARPA CHATS research program.
12# 12#
13# Redistribution and use in source and binary forms, with or without 13# Redistribution and use in source and binary forms, with or without
14# modification, are permitted provided that the following conditions 14# modification, are permitted provided that the following conditions
@@ -174,20 +174,20 @@ MODULE_DIR=../modules @@ -174,20 +174,20 @@ MODULE_DIR=../modules
174.ifdef _CURDIR 174.ifdef _CURDIR
175PAM_DIR=${_CURDIR} 175PAM_DIR=${_CURDIR}
176.else 176.else
177PAM_DIR=${.CURDIR} 177PAM_DIR=${.CURDIR}
178.endif 178.endif
179.for MOD in ${STATIC_MODULES} 179.for MOD in ${STATIC_MODULES}
180MODOBJDIR!= cd ${PAM_DIR}/${MODULE_DIR}/${MOD} && ${PRINTOBJDIR} 180MODOBJDIR!= cd ${PAM_DIR}/${MODULE_DIR}/${MOD} && ${PRINTOBJDIR}
181STATIC_MODULE_LIBS:= ${STATIC_MODULE_LIBS} ${MODOBJDIR}/lib${MOD}.a 181STATIC_MODULE_LIBS:= ${STATIC_MODULE_LIBS} ${MODOBJDIR}/lib${MOD}.a
182.endfor 182.endfor
183 183
184# XXX Using ${.ALLSRC} in the ld command causes openpam_static.c to be 184# XXX Using ${.ALLSRC} in the ld command causes openpam_static.c to be
185# XXX used. Why??!! --thorpej 185# XXX used. Why??!! --thorpej
186openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS} 186openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS}
187 ${LD} -o ${.TARGET} -r --whole-archive openpam_static.o \ 187 ${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
188 ${STATIC_MODULE_LIBS} 188 openpam_static.o ${STATIC_MODULE_LIBS}
189 189
190.include <bsd.lib.mk> 190.include <bsd.lib.mk>
191.PATH.h: ${DIST}/include 191.PATH.h: ${DIST}/include
192.PATH.c: ${DIST}/lib 192.PATH.c: ${DIST}/lib
193.PATH.3: ${DIST}/doc/man 193.PATH.3: ${DIST}/doc/man