[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.31 and 1.32

version 1.31, 2001/07/19 23:16:17 version 1.32, 2001/07/20 19:48:26
Line 9 
Line 9 
 .endif  .endif
   
 .if exists(${.CURDIR}/shlib_version)  .if exists(${.CURDIR}/shlib_version)
 .include "${.CURDIR}/shlib_version"  SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
   SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 .endif  .endif
   
 .MAIN: all  .MAIN: all
Line 133 
Line 134 
 .if (${MACHINE_ARCH} != "mips")  .if (${MACHINE_ARCH} != "mips")
 _LIBS+=lib${LIB}_pic.a  _LIBS+=lib${LIB}_pic.a
 .endif  .endif
 .if defined(major) && defined(minor)  .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 _LIBS+=lib${LIB}.so.${major}.${minor}  _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif  .endif
 .endif  .endif
   
Line 173 
Line 174 
         @${AR} cq lib${LIB}_pic.a `${LORDER} ${SOBJS} | tsort -q`          @${AR} cq lib${LIB}_pic.a `${LORDER} ${SOBJS} | tsort -q`
         ${RANLIB} lib${LIB}_pic.a          ${RANLIB} lib${LIB}_pic.a
   
 lib${LIB}.so.${major}.${minor}: ${SOBJS} ${DPADD}  .if (${MACHINE_ARCH} == "mips")
         @echo building shared ${LIB} library \(version ${major}.${minor}\)  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${OBJS} ${DPADD}
         @rm -f lib${LIB}.so.${major}.${minor}          @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
           @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
           ${CC} -shared ${PICFLAG} -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR} \
               -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
               `${LORDER} ${OBJS}|tsort -q` ${LDADD}
   .else
   lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS} ${DPADD}
           @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
           @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
         ${CC} -shared ${PICFLAG} \          ${CC} -shared ${PICFLAG} \
             -o lib${LIB}.so.${major}.${minor} \              -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
             `${LORDER} ${SOBJS}|tsort -q` ${LDADD}              `${LORDER} ${SOBJS}|tsort -q` ${LDADD}
   .endif
   
 LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}  LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 # the following looks XXX to me... -- cgd  # the following looks XXX to me... -- cgd
Line 252 
Line 262 
 .endif  .endif
         chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a          chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif  .endif
 .if !defined(NOPIC) && defined(major) && defined(minor)  .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
         ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \          ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
             lib${LIB}.so.${major}.${minor} ${DESTDIR}${LIBDIR}              lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
 .endif  .endif
 .if !defined(NOLINT)  .if !defined(NOLINT)
         ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \          ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
             llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}              llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
 .endif  .endif
 .if defined(LINKS) && !empty(LINKS)  .if defined(LINKS) && !empty(LINKS)
 .  for lnk file in ${LINKS}          @set ${LINKS}; \
         @l=${DESTDIR}${lnk}; \          while test $$# -ge 2; do \
          t=${DESTDIR}${file}; \                  l=${DESTDIR}$$1; \
          echo $$t -\> $$l; \                  shift; \
          rm -f $$t; ln $$l $$t                  t=${DESTDIR}$$1; \
 .  endfor                  shift; \
                   echo $$t -\> $$l; \
                   rm -f $$t; \
                   ln $$l $$t; \
           done; true
 .endif  .endif
   
 install: maninstall _SUBDIRUSE  install: maninstall _SUBDIRUSE
Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32