[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.355.2.1 and 1.356

version 1.355.2.1, 2015/06/05 17:03:43 version 1.356, 2014/12/01 01:34:30
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
Line 64  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so 
 .endif                                                                  # }  .endif                                                                  # }
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .pico .go .ln  MKDEP_SUFFIXES?=        .o .po .pico .go .ln .d
   
 .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
Line 406  _LIB.ln:=llib-l${LIB}.ln
Line 406  _LIB.ln:=llib-l${LIB}.ln
 _LIB.so:=${_LIB}.so  _LIB.so:=${_LIB}.so
 _LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}  _LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
 _LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}  _LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
 _LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link  
 .if ${MKDEBUG} != "no"  .if ${MKDEBUG} != "no"
 _LIB.so.debug:=${_LIB.so.full}.debug  _LIB.so.debug:=${_LIB.so.full}.debug
 .endif  .endif
Line 615  LIBCC:= ${CC}
Line 614  LIBCC:= ${CC}
 _LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}  _LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}
 _LDFLAGS.${_LIB}=       ${LDFLAGS} ${LDFLAGS.${_LIB}}  _LDFLAGS.${_LIB}=       ${LDFLAGS} ${LDFLAGS.${_LIB}}
   
 _MAINLIBDEPS=   ${SOLIB} ${DPADD} ${DPLIBC} \  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPLIBC} \
                 ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
   
 .if defined(_LIB.so.debug)  
 ${_LIB.so.debug}: ${_LIB.so.link}  
         ${_MKTARGET_CREATE}  
         (  ${OBJCOPY} --only-keep-debug \  
                 ${_LIB.so.link} ${_LIB.so.debug} \  
         ) || (rm -f ${.TARGET}; false)  
 ${_LIB.so.full}: ${_LIB.so.link} ${_LIB.so.debug}  
         ${_MKTARGET_CREATE}  
         (  ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \  
                 --add-gnu-debuglink=${_LIB.so.debug} \  
                 ${_LIB.so.link} ${_LIB.so.full} \  
         ) || (rm -f ${.TARGET}; false)  
 ${_LIB.so.link}: ${_MAINLIBDEPS}  
 .else # aka no MKDEBUG  
 ${_LIB.so.full}: ${_MAINLIBDEPS}  
 .endif  
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
Line 643  ${_LIB.so.full}: ${_MAINLIBDEPS}
Line 625  ${_LIB.so.full}: ${_MAINLIBDEPS}
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does  #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX  #  this spend so much effort on libraries that aren't live??? XXX
 #  XXX Also creates dead symlinks until the .full rule runs  
 #  above and creates the main link  
 .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \  .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
     "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"      "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
         ${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp          ${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp
Line 656  ${_LIB.so.full}: ${_MAINLIBDEPS}
Line 636  ${_LIB.so.full}: ${_MAINLIBDEPS}
         ${OBJCOPY} -R .ident ${.TARGET}          ${OBJCOPY} -R .ident ${.TARGET}
 .endif  .endif
   
   .if defined(_LIB.so.debug)
   ${_LIB.so.debug}: ${_LIB.so.full}
           ${_MKTARGET_CREATE}
           (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
           && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
                   --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
           ) || (rm -f ${.TARGET}; false)
   .endif
   
 .if !empty(LOBJS)                                                       # {  .if !empty(LOBJS)                                                       # {
 LLIBS?=         -lc  LLIBS?=         -lc
 ${_LIB.ln}: ${LOBJS}  ${_LIB.ln}: ${LOBJS}
Legend:
Removed from v.1.355.2.1  
changed lines
  Added in v.1.356
CVSweb <webmaster@jp.NetBSD.org>