Module Name: src Committed By: riastradh Date: Tue Jan 14 19:45:53 UTC 2025
Modified Files: src/share/mk: bsd.prog.mk Log Message: bsd.prog.mk: Indent PROGDPLIBS logic for clarity. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.353 -r1.354 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.353 src/share/mk/bsd.prog.mk:1.354 --- src/share/mk/bsd.prog.mk:1.353 Tue Jan 14 19:44:43 2025 +++ src/share/mk/bsd.prog.mk Tue Jan 14 19:45:53 2025 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.353 2025/01/14 19:44:43 riastradh Exp $ +# $NetBSD: bsd.prog.mk,v 1.354 2025/01/14 19:45:53 riastradh Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -384,25 +384,25 @@ PROGS= ${PROG} ##### Libraries that this may depend upon. .if defined(PROGDPLIBS) # { -.for _lib _dir in ${PROGDPLIBS} -.if !defined(LIBDO.${_lib}) +. for _lib _dir in ${PROGDPLIBS} +. if !defined(LIBDO.${_lib}) LIBDO.${_lib}!= cd "${_dir}" && ${PRINTOBJDIR} .MAKEOVERRIDES+=LIBDO.${_lib} -.endif -.if defined(PROGDPLIBSSTATIC) +. endif +. if defined(PROGDPLIBSSTATIC) DPADD+= ${LIBDO.${_lib}}/lib${_lib}.a LDADD+= ${LIBDO.${_lib}}/lib${_lib}.a -.else +. else LDADD+= -L${LIBDO.${_lib}} -l${_lib} -.if exists(${LIBDO.${_lib}}/lib${_lib}_pic.a) +. if exists(${LIBDO.${_lib}}/lib${_lib}_pic.a) DPADD+= ${LIBDO.${_lib}}/lib${_lib}_pic.a -.elif exists(${LIBDO.${_lib}}/lib${_lib}.so) +. elif exists(${LIBDO.${_lib}}/lib${_lib}.so) DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so -.else +. else DPADD+= ${LIBDO.${_lib}}/lib${_lib}.a -.endif -.endif -.endfor +. endif +. endif +. endfor .endif # } LDADD+=${LDADD_AFTER}