[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.289 and 1.289.2.2

version 1.289, 2008/10/19 22:05:21 version 1.289.2.2, 2009/01/09 03:35:51
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 367  LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l
Line 373  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 406  _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
Line 412  _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 489  LDADD+= -lgcc_pic
Line 493  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} \              ${_LIBLDOPTS} \
             -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -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} \
             -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

Legend:
Removed from v.1.289  
changed lines
  Added in v.1.289.2.2

CVSweb <webmaster@jp.NetBSD.org>