[BACK]Return to bsd.lib.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.lib.mk between version 1.288 and 1.298

version 1.288, 2008/10/19 15:22:50 version 1.298, 2009/04/10 16:16:12
Line 9 
Line 9 
   
 LIBISMODULE?=   no  LIBISMODULE?=   no
 LIBISPRIVATE?=  no  LIBISPRIVATE?=  no
   LIBISCXX?=      no
   
 _LIB_PREFIX=    lib  _LIB_PREFIX=    lib
   
Line 24  MKSTATICLIB:= no
Line 25  MKSTATICLIB:= no
 .if ${LIBISPRIVATE} != "no"  .if ${LIBISPRIVATE} != "no"
 MKDEBUGLIB:=    no  MKDEBUGLIB:=    no
 MKLINT:=        no  MKLINT:=        no
   MKPICINSTALL:=  no
   . if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
   MKSTATICLIB:=   no
   . else
 MKPIC:=         no  MKPIC:=         no
   . endif
 MKPROFILE:=     no  MKPROFILE:=     no
 .endif  .endif
   
Line 63  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
Line 69  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .so .go .ln  MKDEP_SUFFIXES?=        .o .po .so .go .ln
   
   # Use purely kernel private headers in rump builds
   .if !defined(RUMPKERNEL)
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}  CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
   .endif
   
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {  .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
 SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor  SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
 SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny  SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny
   
   DPADD+= ${SHLIB_VERSION_FILE}
   
 # Check for higher installed library versions.  # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \  .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
         exists(${NETBSDSRCDIR}/lib/checkver)          exists(${NETBSDSRCDIR}/lib/checkver)
 checkver:  checkver:
         @(cd ${.CURDIR} && \          @(cd ${.CURDIR} && \
               HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
             ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \              ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
                     -d ${DESTDIR}${_LIBSODIR} ${LIB})                      -d ${DESTDIR}${_LIBSODIR} ${LIB})
 .endif  .endif
Line 366  LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l
Line 379  LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l
 .if ${LIBISPRIVATE} != "no"  .if ${LIBISPRIVATE} != "no"
 # No installation is required  # No installation is required
 libinstall::  libinstall::
 .else   # ${LIBISPRIVATE} == "no"                                       # {  .endif  # ${LIBISPRIVATE} == "no"                                       # {
   
 .if ${MKDEBUGLIB} != "no"  .if ${MKDEBUGLIB} != "no"
 _LIBS+=lib${LIB}_g.a  _LIBS+=lib${LIB}_g.a
Line 405  _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
Line 418  _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
 _LIBS+=llib-l${LIB}.ln  _LIBS+=llib-l${LIB}.ln
 .endif  .endif
   
 .endif  # ${LIBISPRIVATE} == "no"                                       # }  
   
 ALLOBJS=  ALLOBJS=
 .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \  .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
         || ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"          || ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
Line 427  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 438  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
   
   MKARZERO?=no
   
   .if ${MKARZERO} == "yes"
   _ARFL=crsD
   _ARRANFL=sD
   _INSTRANLIB=
   .else
   _ARFL=crs
   _ARRANFL=s
   _INSTRANLIB=${empty(PRESERVE):?-a "${RANLIB} -t":}
   .endif
   
   # If you change this, please consider reflecting the change in
   # the override in sys/rump/Makefile.rump.
 .if !target(__archivebuild)  .if !target(__archivebuild)
 __archivebuild: .USE  __archivebuild: .USE
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`          ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
         ${RANLIB} ${.TARGET}  
 .endif  .endif
   
 .if !target(__archiveinstall)  .if !target(__archiveinstall)
 __archiveinstall: .USE  __archiveinstall: .USE
         ${_MKTARGET_INSTALL}          ${_MKTARGET_INSTALL}
         ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \          ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
             ${empty(PRESERVE):?-a "${RANLIB} -t":} ${.ALLSRC} ${.TARGET}              ${_INSTRANLIB} ${.ALLSRC} ${.TARGET}
 .endif  .endif
   
 __archivesymlinkpic: .USE  __archivesymlinkpic: .USE
Line 488  LDADD+= -lgcc_pic
Line 512  LDADD+= -lgcc_pic
 .endif  .endif
 .endif  .endif
   
   .if ${LIBISCXX} != "no"
   LIBCC:= ${CXX}
   .else
   LIBCC:= ${CC}
   .endif
   
 lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${CC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             ${_LIBLDOPTS} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \  
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${LDADD} \
               ${_LIBLDOPTS} ${LDFLAGS} \
             -L${_GCC_LIBGCCDIR}              -L${_GCC_LIBGCCDIR}
 .else  .else
         ${CC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \
             -o ${.TARGET} ${_LIBLDOPTS} \              -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
 .endif  .endif
Line 703  ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
Line 733  ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .endif  # !target(libinstall)                                           # }  .endif  # !target(libinstall)                                           # }
   
 ##### Pull in related .mk logic  ##### Pull in related .mk logic
   LINKSOWN?= ${LIBOWN}
   LINKSGRP?= ${LIBGRP}
   LINKSMODE?= ${LIBMODE}
 .include <bsd.man.mk>  .include <bsd.man.mk>
 .include <bsd.nls.mk>  .include <bsd.nls.mk>
 .include <bsd.files.mk>  .include <bsd.files.mk>

Legend:
Removed from v.1.288  
changed lines
  Added in v.1.298

CVSweb <webmaster@jp.NetBSD.org>