[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.269.2.5

version 1.269.2.4, 2013/01/23 00:05:36 version 1.269.2.5, 2014/05/22 11:37:53
Line 33  CLEANFILES+=strings
Line 33  CLEANFILES+=strings
 .c.o:  .c.o:
         ${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -          ${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
         @${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}          @${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         @rm -f x.c          @rm -f x.c
   
 .cc.o .cpp.o .cxx.o .C.o:  .cc.o .cpp.o .cxx.o .C.o:
         ${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -          ${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
         @mv -f x.c x.cc          @mv -f x.c x.cc
         @${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}          @${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         @rm -f x.cc          @rm -f x.cc
 .endif  .endif
   
Line 56  OBJCFLAGS+= ${OBJCOPTS}
Line 62  OBJCFLAGS+= ${OBJCOPTS}
 MKDEP_SUFFIXES?=        .o .ln  MKDEP_SUFFIXES?=        .o .ln
   
 # CTF preserve debug symbols  # CTF preserve debug symbols
 .if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")  .if (${MKCTF:Uno} != "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 77  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
Line 86  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 98  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
Line 112  LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
         c_pic \          c_pic \
         com_err \          com_err \
         compat \          compat \
         crt0 \  
         crypt \          crypt \
         crypto \          crypto \
         crypto_idea \          crypto_idea \
Line 263  LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
Line 276  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 371  PROGS=  ${PROG}
Line 388  PROGS=  ${PROG}
 .  endif  .  endif
 .endif  .endif
   
   ##### Libraries that this may depend upon.
   .if defined(PROGDPLIBS)                                                 # {
   .for _lib _dir in ${PROGDPLIBS}
   .if !defined(BINDO.${_lib})
   PROGDO.${_lib}!=        cd "${_dir}" && ${PRINTOBJDIR}
   .MAKEOVERRIDES+=PROGDO.${_lib}
   .endif
   LDADD+=         -L${PROGDO.${_lib}} -l${_lib}
   .if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
   DPADD+=         ${PROGDO.${_lib}}/lib${_lib}_pic.a
   .elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
   DPADD+=         ${PROGDO.${_lib}}/lib${_lib}.so
   .else
   DPADD+=         ${PROGDO.${_lib}}/lib${_lib}.a
   .endif
   .endfor
   .endif                                                                  # }
 #  #
 # Per-program definitions and targets.  # Per-program definitions and targets.
 #  #
Line 449  NODPSRCS+= ${f}
Line 483  NODPSRCS+= ${f}
 .endif  .endif
 .endfor  .endfor
   
 ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_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 482  CLEANFILES+= ${_P}.d
Line 517  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} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
       ${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}} ${_LDADD.${_P}} \              ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}
             ${_PROGLDOPTS}  
 .if defined(CTFMERGE)  .if defined(CTFMERGE)
         ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}          ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif  .endif
Line 503  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
Line 538  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
   
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}  ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}          ${CC} ${LDFLAGS:N-Wl,-pie} -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.4  
changed lines
  Added in v.1.269.2.5

CVSweb <webmaster@jp.NetBSD.org>