Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Allow DPADD to be specified on a per-program basis.



details:   https://anonhg.NetBSD.org/src/rev/f8d7dcbf3fb4
branches:  trunk
changeset: 781181:f8d7dcbf3fb4
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Fri Aug 24 20:26:24 2012 +0000

description:
Allow DPADD to be specified on a per-program basis.

diffstat:

 share/mk/bsd.prog.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r fb3be456aee3 -r f8d7dcbf3fb4 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Fri Aug 24 20:25:50 2012 +0000
+++ b/share/mk/bsd.prog.mk      Fri Aug 24 20:26:24 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.277 2012/08/23 21:21:16 joerg Exp $
+#      $NetBSD: bsd.prog.mk,v 1.278 2012/08/24 20:26:24 jmmv Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -405,6 +405,7 @@
 
 ##### PROG specific flags.
 
+_DPADD.${_P}=          ${DPADD}    ${DPADD.${_P}}
 _LDADD.${_P}=          ${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=                ${LDFLAGS}  ${LDFLAGS.${_P}}
 _LDSTATIC.${_P}=       ${LDSTATIC} ${LDSTATIC.${_P}}
@@ -445,7 +446,7 @@
 .endif
 .endfor
 
-${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
        ${_MKTARGET_LINK}
 .if defined(DESTDIR)
        ${_CCLINK.${_P}} -Wl,-nostdlib \
@@ -478,7 +479,7 @@
 
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 
-${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
 .if !commands(${_P})
        ${_MKTARGET_LINK}
        ${_CCLINK.${_P}} \
@@ -497,7 +498,7 @@
 .endif # !commands(${_P})
 .endif # USE_COMBINE
 
-${_P}.ro: ${OBJS.${_P}} ${DPADD}
+${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
        ${_MKTARGET_LINK}
        ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 



Home | Main Index | Thread Index | Old Index