[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.5 and 1.281

version 1.269.2.5, 2014/05/22 11:37:53 version 1.281, 2013/02/14 01:58:00
Line 62  OBJCFLAGS+= ${OBJCOPTS}
Line 62  OBJCFLAGS+= ${OBJCOPTS}
 MKDEP_SUFFIXES?=        .o .ln  MKDEP_SUFFIXES?=        .o .ln
   
 # CTF preserve debug symbols  # CTF preserve debug symbols
 .if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")  .if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")
 CTFFLAGS+= -g  CTFFLAGS+= -g
 CTFMFLAGS+= -g  CTFMFLAGS+= -g
 .if defined(HAVE_GCC) && ${HAVE_GCC} >= 48  
 #CFLAGS+=-gdwarf-2  
 .endif  
 .endif  .endif
   
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o  # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
Line 86  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
Line 83  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
 .MADE: ${LIBCRT0}  .MADE: ${LIBCRT0}
 .endif  .endif
   
 .ifndef LIBCRTI  
 LIBCRTI=        ${DESTDIR}/usr/lib/crti.o  
 .MADE: ${LIBCRTI}  
 .endif  
   
 ##### Installed system library definitions  ##### Installed system library definitions
 #  #
 #       E.g.  #       E.g.
Line 112  LIBCRTI= ${DESTDIR}/usr/lib/crti.o
Line 104  LIBCRTI= ${DESTDIR}/usr/lib/crti.o
         c_pic \          c_pic \
         com_err \          com_err \
         compat \          compat \
           crt0 \
         crypt \          crypt \
         crypto \          crypto \
         crypto_idea \          crypto_idea \
Line 276  LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
Line 269  LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
 .endif  .endif
 .endfor  .endfor
   
 # Ugly one-offs  
 LIBX11_XCB=     ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a  
 LIBXCB= ${DESTDIR}${X11USRLIBDIR}/libxcb.a  
   
 .if defined(RESCUEDIR)  .if defined(RESCUEDIR)
 CPPFLAGS+=      -DRESCUEDIR=\"${RESCUEDIR}\"  CPPFLAGS+=      -DRESCUEDIR=\"${RESCUEDIR}\"
 .endif  .endif
Line 392  PROGS=  ${PROG}
Line 381  PROGS=  ${PROG}
 .if defined(PROGDPLIBS)                                                 # {  .if defined(PROGDPLIBS)                                                 # {
 .for _lib _dir in ${PROGDPLIBS}  .for _lib _dir in ${PROGDPLIBS}
 .if !defined(BINDO.${_lib})  .if !defined(BINDO.${_lib})
 PROGDO.${_lib}!=        cd "${_dir}" && ${PRINTOBJDIR}  BINDO.${_lib}!= cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=PROGDO.${_lib}  .MAKEOVERRIDES+=BINDO.${_lib}
 .endif  .endif
 LDADD+=         -L${PROGDO.${_lib}} -l${_lib}  LDADD+=         -L${BINDO.${_lib}} -l${_lib}
 .if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)  .if ${MKPICLIB} != "no"
 DPADD+=         ${PROGDO.${_lib}}/lib${_lib}_pic.a  DPADD+=         ${BINDO.${_lib}}/libamu_pic.a
 .elif exists(${PROGDO.${_lib}}/lib${_lib}.so)  .elif ${MKPIC} != "no"
 DPADD+=         ${PROGDO.${_lib}}/lib${_lib}.so  DPADD+=         ${BINDO.${_lib}}/libamu.so
 .else  .else
 DPADD+=         ${PROGDO.${_lib}}/lib${_lib}.a  DPADD+=         ${BINDO.${_lib}}/libamu.a
 .endif  .endif
 .endfor  .endfor
 .endif                                                                  # }  .endif                                                                  # }
Line 483  NODPSRCS+= ${f}
Line 472  NODPSRCS+= ${f}
 .endif  .endif
 .endfor  .endfor
   
 ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \  ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
     ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${_CCLINK.${_P}} -Wl,-nostdlib \          ${_CCLINK.${_P}} -Wl,-nostdlib \
Line 517  CLEANFILES+= ${_P}.d
Line 505  CLEANFILES+= ${_P}.d
   
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
   
 ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
     ${LIBCRTEND} ${_DPADD.${_P}}  
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${_CCLINK.${_P}} \          ${_CCLINK.${_P}} \
             ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \              ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
             ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}              ${OBJS.${_P}} ${_LDADD.${_P}} \
               ${_PROGLDOPTS}
 .if defined(CTFMERGE)  .if defined(CTFMERGE)
         ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}          ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif  .endif
Line 538  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${
Line 526  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${
   
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}  ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${CC} ${LDFLAGS:N-Wl,-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}          ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
   
 .if defined(_PROGDEBUG.${_P})  .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}  ${_PROGDEBUG.${_P}}: ${_P}

Legend:
Removed from v.1.269.2.5  
changed lines
  Added in v.1.281

CVSweb <webmaster@jp.NetBSD.org>