[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.72 and 1.73

version 1.72, 2015/05/14 02:56:01 version 1.73, 2015/07/19 20:45:30
Line 170 
Line 170 
   
 .if !defined(NOPIC)  .if !defined(NOPIC)
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)  .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  FULLSHLIBNAME=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
   _LIBS+=${FULLSHLIBNAME}
 .endif  .endif
   
   .if defined(VERSION_SCRIPT)
   ${FULLSHLIBNAME}:       ${VERSION_SCRIPT}
   LDADD+= -Wl,--version-script=${VERSION_SCRIPT}
 .endif  .endif
   .endif
   
 all: ${_LIBS} _SUBDIRUSE  all: ${_LIBS} _SUBDIRUSE
   
Line 199 
Line 205 
         ${RANLIB} lib${LIB}_p.a          ${RANLIB} lib${LIB}_p.a
   
 SOBJS+= ${OBJS:.o=.so}  SOBJS+= ${OBJS:.o=.so}
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS} ${DPADD}  ${FULLSHLIBNAME}: ${SOBJS} ${DPADD}
         @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)          @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
         @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}          @rm -f ${.TARGET}
         ${CC} -shared ${PICFLAG} \          ${CC} -shared ${PICFLAG} -o ${.TARGET} \
             -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \  
             `${LORDER} ${SOBJS}|tsort -q` ${LDADD}              `${LORDER} ${SOBJS}|tsort -q` ${LDADD}
   
 # all .do files...  # all .do files...
Line 284 
Line 289 
 .endif  .endif
 .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} \
             lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}              ${FULLSHLIBNAME} ${DESTDIR}${LIBDIR}
 .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.72  
changed lines
  Added in v.1.73