[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.5 and 1.6

version 1.5, 1996/03/05 11:12:41 version 1.6, 1996/05/25 09:03:43
Line 83 
Line 83 
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}          @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
         @rm -f ${.TARGET}.o          @rm -f ${.TARGET}.o
   
 .if !defined(PICFLAG)  .if !defined(PICFLAG) && (${MACHINE_ARCH} != "mips")
 PICFLAG=-fpic  PICFLAG=-fpic
 .endif  .endif
   
Line 94 
Line 94 
 .endif  .endif
   
 .if !defined(NOPIC)  .if !defined(NOPIC)
   .if (${MACHINE_ARCH} != "mips")
 _LIBS+=lib${LIB}_pic.a  _LIBS+=lib${LIB}_pic.a
   .endif
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)  .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif  .endif
Line 128 
Line 130 
         @${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
   
   .if (${MACHINE_ARCH} != "mips")
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD}  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${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 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
         $(LD) -x -Bshareable -Bforcearchive \          $(LD) -x -Bshareable -Bforcearchive \
             -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}_pic.a ${LDADD}              -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}_pic.a ${LDADD}
   .else
   lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.a ${DPADD}
           @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
           @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
           $(LD) -x -shared --whole-archive -soname lib${LIB}.so.${SHLIB_MAJOR} \
               -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}.a ${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 179 
Line 189 
         ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a          ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
         chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a          chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif  .endif
 .if !defined(NOPIC)  .if !defined(NOPIC) && (${MACHINE_ARCH} != "mips")
 #       ranlib lib${LIB}_pic.a  #       ranlib lib${LIB}_pic.a
         install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \          install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
             lib${LIB}_pic.a ${DESTDIR}${LIBDIR}              lib${LIB}_pic.a ${DESTDIR}${LIBDIR}

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6