[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.124 and 1.125

version 1.124, 1998/02/18 08:14:31 version 1.125, 1998/02/23 10:09:31
Line 32  SHLIB_MINOR != . ${.CURDIR}/shlib_versio
Line 32  SHLIB_MINOR != . ${.CURDIR}/shlib_versio
   
 # Data-driven table using make variables to control  how shared libraries  # Data-driven table using make variables to control  how shared libraries
 # are built for different platforms and object formats.  # are built for different platforms and object formats.
 # SHLIB_TYPE:           currently either "ELF" or "a.out".  # OBJECT_FMT:           currently either "ELF" or "a.out", from <bsd.own.mk>
 # SHLIB_SOVERSION:      version number to be compiled into a shared library  # SHLIB_SOVERSION:      version number to be compiled into a shared library
 #                       via -soname. Usualy ${SHLIB_MAJOR} on ELF.  #                       via -soname. Usualy ${SHLIB_MAJOR} on ELF.
 #                       NetBSD/pmax used to use ${SHLIB_MAJOR}.{SHLIB-MINOR}.  #                       NetBSD/pmax used to use ${SHLIB_MAJOR}.{SHLIB-MINOR}.
Line 50  SHLIB_MINOR != . ${.CURDIR}/shlib_versio
Line 50  SHLIB_MINOR != . ${.CURDIR}/shlib_versio
   
 .if (${MACHINE_ARCH} == "alpha")  .if (${MACHINE_ARCH} == "alpha")
                 # Alpha-specific shared library flags                  # Alpha-specific shared library flags
 SHLIB_TYPE=ELF  
 SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o  SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o
 SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o  SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o
   
Line 60  CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
Line 59  CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS ?=  APICFLAGS ?=
 .elif (${MACHINE_ARCH} == "mips")  .elif (${MACHINE_ARCH} == "mips")
                 # mips-specific shared library flags                  # mips-specific shared library flags
 SHLIB_TYPE=ELF  
 # Still use gnu-derived ld.so on pmax; don't have or need lib<>.so support.  # Still use gnu-derived ld.so on pmax; don't have or need lib<>.so support.
 SHLIB_LDSTARTFILE=  SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=  SHLIB_LDENDFILE=
Line 79  AS+= -KPIC
Line 77  AS+= -KPIC
   
 .else  .else
   
 # Platform-independent flags for NetBSD a.out shared libraries  # Platform-independent flags for NetBSD a.out shared libraries (and PowerPC)
 SHLIB_TYPE=a.out  
 SHLIB_LDSTARTFILE=  SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=  SHLIB_LDENDFILE=
 SHLIB_SHFLAGS= -Bshareable -Bforcearchive  SHLIB_SHFLAGS=
 SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}  SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
 SHLIB_WHOLE=  SHLIB_WHOLE=-Bforcearchive
 SHLIB_NOWHOLE=  SHLIB_NOWHOLE=
 CPICFLAGS?= -fpic -DPIC  CPICFLAGS?= -fpic -DPIC
 CPPPICFLAGS?= -DPIC  CPPPICFLAGS?= -DPIC
Line 95  APICFLAGS?= -k
Line 92  APICFLAGS?= -k
 .endif  .endif
   
 # Platform-independent linker flags for ELF shared libraries  # Platform-independent linker flags for ELF shared libraries
 .if (${SHLIB_TYPE} == "ELF")  .if (${OBJECT_FMT} == "ELF")
 SHLIB_WHOLE=--whole-archive  SHLIB_WHOLE=--whole-archive
 SHLIB_NOWHOLE=--no-whole-archive  SHLIB_NOWHOLE=--no-whole-archive
 SHLIB_SOVERSION=${SHLIB_MAJOR}  SHLIB_SOVERSION=${SHLIB_MAJOR}
 SHLIB_SHFLAGS=-shared -soname lib${LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=-soname lib${LIB}.so.${SHLIB_SOVERSION}
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
Line 229  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
Line 226  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         @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 ${SHLIB_SHFLAGS} -o ${.TARGET} \          $(LD) -x -Bshareable ${SHLIB_SHFLAGS} -o ${.TARGET} \
             ${SHLIB_LDSTARTFILE} \              ${SHLIB_LDSTARTFILE} \
             ${SHLIB_WHOLE} lib${LIB}_pic.a ${SHLIB_NOWHOLE} ${LDADD} \              ${SHLIB_WHOLE} lib${LIB}_pic.a ${SHLIB_NOWHOLE} ${LDADD} \
             ${SHLIB_LDENDFILE}              ${SHLIB_LDENDFILE}
Line 307  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB
Line 304  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
         ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} \          ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} \
                 ${.TARGET}                  ${.TARGET}
 .if (${SHLIB_TYPE} == "ELF")  .if (${OBJECT_FMT} == "ELF")
         rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}          rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
         ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \          ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
             ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}              ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}

Legend:
Removed from v.1.124  
changed lines
  Added in v.1.125

CVSweb <webmaster@jp.NetBSD.org>