[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.301 and 1.316

version 1.301, 2017/01/29 21:43:56 version 1.316, 2018/07/12 10:46:41
Line 7 
Line 7 
 .include <bsd.shlib.mk>  .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>  .include <bsd.gcc.mk>
   
   ##### Sanitizer specific flags.
   
   CFLAGS+=        ${SANITIZERFLAGS}
   CXXFLAGS+=      ${SANITIZERFLAGS}
   LDFLAGS+=       ${SANITIZERFLAGS}
   
   # Rename the local function definitions to not conflict with libc/rt/pthread/m.
   .if ${MKSANITIZER:Uno} == "yes" && defined(SANITIZER_RENAME_SYMBOL)
   .       for _symbol in ${SANITIZER_RENAME_SYMBOL}
   CPPFLAGS+=      -D${_symbol}=__mksanitizer_${_symbol}
   .       endfor
   .endif
   
 #  #
 # Definitions and targets shared among all programs built by a single  # Definitions and targets shared among all programs built by a single
 # Makefile.  # Makefile.
Line 114  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
Line 127  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
         compat \          compat \
         crypt \          crypt \
         crypto \          crypto \
         crypto_idea \  
         crypto_mdc2 \  
         crypto_rc5 \  
         curses \          curses \
           cxx \
         dbm \          dbm \
         des \          des \
         dns \          dns \
Line 155  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
Line 166  LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D$
         m \          m \
         magic \          magic \
         menu \          menu \
           netpgpverify \
         objc \          objc \
         ossaudio \          ossaudio \
         pam \          pam \
         pcap \          pcap \
         pci \          pci \
         pmc \  
         posix \          posix \
         pthread \          pthread \
         pthread_dbg \  
         puffs \          puffs \
         quota \          quota \
         radius \          radius \
Line 212  LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
Line 222  LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
 .endif  .endif
 .endfor  .endfor
   
   .if (${MKKERBEROS} != "no")
   LIBKRB5_LDADD+= -lkrb5
   LIBKRB5_DPADD+= ${LIBKRB5}
   # Kerberos5 applications, if linked statically, need more libraries
   LIBKRB5_STATIC_LDADD+= \
           -lhx509 -lcrypto -lasn1 -lcom_err -lroken \
           -lwind -lheimbase -lsqlite3 -lcrypt -lutil
   LIBKRB5_STATIC_DPADD+= \
           ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
           ${LIBWIND} ${LIBHEIMBASE} ${LIBSQLITE3} ${LIBCRYPT}  ${LIBUTIL}
   . if (${MKPIC} == "no")
   LIBKRB5_LDADD+= ${LIBKRB5_STATIC_LDADD}
   LIBKRB5_DPADD+= ${LIBKRB5_STATIC_DPADD}
   . endif
   .endif
   
 # PAM applications, if linked statically, need more libraries  # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")  .if (${MKPIC} == "no")
 .if (${MKCRYPTO} != "no")  
 PAM_STATIC_LDADD+= -lssh  PAM_STATIC_LDADD+= -lssh
 PAM_STATIC_DPADD+= ${LIBSSH}  PAM_STATIC_DPADD+= ${LIBSSH}
 .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 -lsqlite3          -lroken -lcom_err -lheimbase -lcrypto -lsqlite3
Line 248  PAM_STATIC_DPADD=
Line 272  PAM_STATIC_DPADD=
         Xaw \          Xaw \
         Xdmcp \          Xdmcp \
         Xext \          Xext \
           Xfont2 \
         Xfont \          Xfont \
         Xft \          Xft \
         Xi \          Xi \
Line 352  SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rum
Line 377  SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rum
 .  endif  .  endif
 .   if (${MKRUMP} != "no")  .   if (${MKRUMP} != "no")
 DPSRCS+=                ${PROG}_rumpops.c ${RUMPSRCS}  DPSRCS+=                ${PROG}_rumpops.c ${RUMPSRCS}
 LDADD.rump.${PROG}+=    -lrumpclient  LDADD.rump.${PROG}+=    ${LDADD.rump} -lrumpclient
 DPADD.rump.${PROG}+=    ${LIBRUMPCLIENT}  DPADD.rump.${PROG}+=    ${DPADD.rump} ${LIBRUMPCLIENT}
 MAN.rump.${PROG}=       # defined but feeling empty  MAN.rump.${PROG}=       # defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined  _RUMPINSTALL.rump.${PROG}=# defined
 .   endif  .   endif
Line 435  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
Line 460  _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=          ${BINDIR}  BINDIR.${_P}?=          ${BINDIR}
 PROGNAME.${_P}?=        ${_P}  PROGNAME.${_P}?=        ${_P}
   
 .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P})  .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P}) && \
       empty(SRCS.${_P}:M*.sh)
 _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug  _PROGDEBUG.${_P}:=      ${PROGNAME.${_P}}.debug
 .endif  .endif
   
Line 448  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
Line 474  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
 _DPADD.${_P}=           ${DPADD}    ${DPADD.${_P}}  _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}}
   .if ${MKSANITIZER} != "yes"
   # Sanitizers don't support static build.
 _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}  _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}
   .endif
   
 ##### Build and install rules  ##### Build and install rules
 .if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])  .if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
Legend:
Removed from v.1.301  
changed lines
  Added in v.1.316
CVSweb <webmaster@jp.NetBSD.org>