[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.294 and 1.299.2.2

version 1.294, 2016/01/23 21:22:47 version 1.299.2.2, 2017/04/26 02:52:59
Line 48  CLEANFILES+=strings
Line 48  CLEANFILES+=strings
         @rm -f x.cc          @rm -f x.cc
 .endif  .endif
   
 .if defined(MKPIE) && (${MKPIE} != "no")  .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=        ${PIE_CFLAGS}  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 LDFLAGS+=       ${PIE_LDFLAGS}  LDFLAGS+=       ${"${LDSTATIC.${.TARGET}}" == "-static" :? : ${PIE_LDFLAGS}}
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
 .if defined(MKDEBUG) && (${MKDEBUG} != "no")  .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
 CFLAGS+=        -g  CFLAGS+=        -g
 .endif  .endif
 OBJCFLAGS+=     ${OBJCOPTS}  OBJCFLAGS+=     ${OBJCOPTS}
Line 65  MKDEP_SUFFIXES?= .o .ln .d
Line 65  MKDEP_SUFFIXES?= .o .ln .d
 .if (${MKCTF:Uno} != "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  .if defined(HAVE_GCC)
 #CFLAGS+=-gdwarf-2  #CFLAGS+=-gdwarf-2
 .endif  .endif
 .endif  .endif
Line 118  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
Line 118  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
         crypto_mdc2 \          crypto_mdc2 \
         crypto_rc5 \          crypto_rc5 \
         curses \          curses \
           cxx \
         dbm \          dbm \
         des \          des \
         dns \          dns \
Line 155  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
Line 156  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
         m \          m \
         magic \          magic \
         menu \          menu \
           netpgpverify \
         objc \          objc \
         ossaudio \          ossaudio \
         pam \          pam \
Line 163  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
Line 165  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
         pmc \          pmc \
         posix \          posix \
         pthread \          pthread \
         pthread_dbg \  
         puffs \          puffs \
         quota \          quota \
         radius \          radius \
Line 219  PAM_STATIC_DPADD+= ${LIBSSH}
Line 220  PAM_STATIC_DPADD+= ${LIBSSH}
 .endif  .endif
 .if (${MKKERBEROS} != "no")  .if (${MKKERBEROS} != "no")
 PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \  PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
         -lroken -lcom_err -lheimbase -lcrypto          -lroken -lcom_err -lheimbase -lcrypto -lsqlite3
 PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \  PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
         ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO}          ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
 .endif  .endif
 .if (${MKSKEY} != "no")  .if (${MKSKEY} != "no")
 PAM_STATIC_LDADD+= -lskey  PAM_STATIC_LDADD+= -lskey
Line 434  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
Line 435  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=          ${BINDIR}  BINDIR.${_P}?=          ${BINDIR}
 PROGNAME.${_P}?=        ${_P}  PROGNAME.${_P}?=        ${_P}
   
 .if ${MKDEBUG} != "no" && !commands(${_P})  .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P})
 _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug  _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug
 .endif  .endif
   
Line 540  ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${
Line 541  ${_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:N-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.294  
changed lines
  Added in v.1.299.2.2

CVSweb <webmaster@jp.NetBSD.org>