[BACK]Return to bsd.prog.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.prog.mk between version 1.269.2.4 and 1.276

version 1.269.2.4, 2013/01/23 00:05:36 version 1.276, 2012/08/23 15:45:03
Line 49  LDFLAGS+= ${PIE_LDFLAGS}
Line 49  LDFLAGS+= ${PIE_LDFLAGS}
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
 .if defined(MKDEBUG) && (${MKDEBUG} != "no")  
 CFLAGS+=        -g  
 .endif  
 OBJCFLAGS+=     ${OBJCOPTS}  OBJCFLAGS+=     ${OBJCOPTS}
 MKDEP_SUFFIXES?=        .o .ln  MKDEP_SUFFIXES?=        .o .ln
   
Line 274  _PROGLDOPTS+= -Wl,-dynamic-linker=${_SHL
Line 271  _PROGLDOPTS+= -Wl,-dynamic-linker=${_SHL
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath,${SHLIBDIR} \  _PROGLDOPTS+=   -Wl,-rpath,${SHLIBDIR} \
                 -L=${SHLIBDIR}                  -L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"  
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \  
                 -L=${SHLIBINSTALLDIR}  
 .endif  .endif
   
 __proginstall: .USE  __proginstall: .USE
Line 408  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
Line 402  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
   
 ##### PROG specific flags.  ##### PROG specific flags.
   
 _DPADD.${_P}=           ${DPADD}    ${DPADD.${_P}}  
 _LDADD.${_P}=           ${LDADD}    ${LDADD.${_P}}  _LDADD.${_P}=           ${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=         ${LDFLAGS}  ${LDFLAGS.${_P}}  _LDFLAGS.${_P}=         ${LDFLAGS}  ${LDFLAGS.${_P}}
 _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}  _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}
Line 449  NODPSRCS+= ${f}
Line 442  NODPSRCS+= ${f}
 .endif  .endif
 .endfor  .endfor
   
 ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${_CCLINK.${_P}} -Wl,-nostdlib \          ${_CCLINK.${_P}} -Wl,-nostdlib \
Line 482  CLEANFILES+= ${_P}.d
Line 475  CLEANFILES+= ${_P}.d
   
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
   
 ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${_CCLINK.${_P}} \          ${_CCLINK.${_P}} \
Line 501  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
Line 494  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 .endif  # !commands(${_P})  .endif  # !commands(${_P})
 .endif  # USE_COMBINE  .endif  # USE_COMBINE
   
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}  ${_P}.ro: ${OBJS.${_P}} ${DPADD}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}          ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
   
Legend:
Removed from v.1.269.2.4  
changed lines
  Added in v.1.276
CVSweb <webmaster@jp.NetBSD.org>