[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.230 and 1.231

version 1.230, 2008/07/29 13:17:41 version 1.231, 2008/08/25 08:03:14
Line 161  _PROGLDOPTS+= -Wl,-dynamic-linker=${_SHL
Line 161  _PROGLDOPTS+= -Wl,-dynamic-linker=${_SHL
 .endif  .endif
 .endif  .endif
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \  _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
                 -R${SHLIBDIR} \                  -R${SHLIBDIR} \
                 -L${DESTDIR}${SHLIBDIR}                  -L${DESTDIR}${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"  .elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \  _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
                 -L${DESTDIR}${SHLIBINSTALLDIR}                  -L${DESTDIR}${SHLIBINSTALLDIR}
 .endif  .endif
   _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}/usr/lib \
                   -L${DESTDIR}/usr/lib
   
 __proginstall: .USE  __proginstall: .USE
         ${_MKTARGET_INSTALL}          ${_MKTARGET_INSTALL}
Line 189  __progdebuginstall: .USE
Line 191  __progdebuginstall: .USE
 _APPEND_MANS=yes  _APPEND_MANS=yes
 _APPEND_SRCS=yes  _APPEND_SRCS=yes
   
   _CCLINKFLAGS=
   .if defined(DESTDIR)
   _CCLINKFLAGS+=  -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/
   .endif
   
 .if defined(PROG_CXX)  .if defined(PROG_CXX)
 PROG=           ${PROG_CXX}  PROG=           ${PROG_CXX}
 _CCLINK=        ${CXX} # XXX Some Makefiles rely on this being public.  _CCLINK=        ${CXX} ${_CCLINKFLAGS}
 .endif  .endif
   
 .if defined(PROG)  .if defined(PROG)
 _CCLINK?=       ${CC} # XXX Some Makefiles rely on this being public.  _CCLINK?=       ${CC} ${_CCLINKFLAGS}
 .  if defined(MAN)  .  if defined(MAN)
 MAN.${PROG}=    ${MAN}  MAN.${PROG}=    ${MAN}
 _APPEND_MANS=   no  _APPEND_MANS=   no
Line 229  PROGS=  ${PROG}
Line 236  PROGS=  ${PROG}
 # Definitions specific to C programs.  # Definitions specific to C programs.
 .for _P in ${PROGS}  .for _P in ${PROGS}
 SRCS.${_P}?=    ${_P}.c  SRCS.${_P}?=    ${_P}.c
 _CCLINK.${_P}=  ${CC}  _CCLINK.${_P}=  ${CC} ${_CCLINKFLAGS}
 .endfor  .endfor
   
 # Definitions specific to C++ programs.  # Definitions specific to C++ programs.
 .for _P in ${PROGS_CXX}  .for _P in ${PROGS_CXX}
 SRCS.${_P}?=    ${_P}.cc  SRCS.${_P}?=    ${_P}.cc
 _CCLINK.${_P}=  ${CXX}  _CCLINK.${_P}=  ${CXX} ${_CCLINKFLAGS}
 .endfor  .endfor
   
 # Language-independent definitions.  # Language-independent definitions.
Line 292  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
Line 299  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
 .if defined(DESTDIR)          ${_CCLINK.${_P}} \
         ${_CCLINK.${_P}} -Wl,-nostdlib \              ${DESTDIR:D-Wl,-nostdlib -L${_GCC_LIBGCCDIR}} \
             ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \              ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
             -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/  \              ${OBJS.${_P}} ${_LDADD.${_P}}
             ${OBJS.${_P}} ${_LDADD.${_P}} \  
             -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib  
 .else  
         ${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS.${_P}} ${_LDADD.${_P}}  
 .endif  # defined(DESTDIR)  
 .if defined(PAXCTL_FLAGS.${_P})  .if defined(PAXCTL_FLAGS.${_P})
         ${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}          ${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif  .endif
Legend:
Removed from v.1.230  
changed lines
  Added in v.1.231
CVSweb <webmaster@jp.NetBSD.org>