[BACK]Return to bsd.lib.mk CVS log [TXT][DIR] Up to [local] / src / share / mk

Diff for /src/share/mk/bsd.lib.mk between version 1.74 and 1.75

version 1.74, 2015/10/26 10:43:42 version 1.75, 2016/04/26 14:49:15
Line 174 
Line 174 
 _LIBS+=${FULLSHLIBNAME}  _LIBS+=${FULLSHLIBNAME}
 .endif  .endif
   
   .if defined(LIBREBUILD)
   _LIBS+=${FULLSHLIBNAME}.a
   
   .if exists(${.CURDIR}/Symbols.list)
   SYMBOLSMAP=Symbols.map
   .endif
   
   .endif
   
 .if defined(VERSION_SCRIPT)  .if defined(VERSION_SCRIPT)
 ${FULLSHLIBNAME}:       ${VERSION_SCRIPT}  ${FULLSHLIBNAME}:       ${VERSION_SCRIPT}
 LDADD+= -Wl,--version-script=${VERSION_SCRIPT}  LDADD+= -Wl,--version-script=${VERSION_SCRIPT}
Line 209 
Line 218 
         @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)          @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
         @rm -f ${.TARGET}          @rm -f ${.TARGET}
         ${CC} -shared ${PICFLAG} -o ${.TARGET} \          ${CC} -shared ${PICFLAG} -o ${.TARGET} \
             `${LORDER} ${SOBJS}|tsort -q` ${LDADD}              `echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD}
   
   ${FULLSHLIBNAME}.a: ${SOBJS}
           @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\) ar
           @rm -f ${.TARGET}
           @echo ${PICFLAG} ${LDADD} > .ldadd
           ar cq ${FULLSHLIBNAME}.a ${SOBJS} .ldadd ${SYMBOLSMAP}
   
 # all .do files...  # all .do files...
 DOBJS+= ${OBJS:.o=.do}  DOBJS+= ${OBJS:.o=.do}
   
Line 290 
Line 305 
 .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)  .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
         ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \          ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
             ${FULLSHLIBNAME} ${DESTDIR}${LIBDIR}              ${FULLSHLIBNAME} ${DESTDIR}${LIBDIR}
   .if defined(LIBREBUILD)
           ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
               ${FULLSHLIBNAME}.a ${DESTDIR}${LIBDIR}
   .endif
 .endif  .endif
 .if defined(LINKS) && !empty(LINKS)  .if defined(LINKS) && !empty(LINKS)
 .  for lnk file in ${LINKS}  .  for lnk file in ${LINKS}

Legend:
Removed from v.1.74  
changed lines
  Added in v.1.75