[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.168 and 1.178

version 1.168, 2000/06/06 09:22:01 version 1.178, 2000/12/05 22:18:30
Line 19  clean cleandir distclean: cleanlib
Line 19  clean cleandir distclean: cleanlib
 .if exists(${SHLIB_VERSION_FILE})  .if exists(${SHLIB_VERSION_FILE})
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
 SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor  SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
   SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny
   
 # Check for higher installed library versions.  # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \  .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
         exists(${BSDSRCDIR}/lib/checkver)          exists(${BSDSRCDIR}/lib/checkver)
 checkver:  checkver:
         @(cd ${.CURDIR} && \          @(cd ${.CURDIR} && \
                 ${BSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \                  sh ${BSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
                     -d ${DESTDIR}${LIBDIR} ${LIB})                      -d ${DESTDIR}${LIBDIR} ${LIB})
 .else  .endif
   .endif
   
   .if !target(checkver)
 checkver:  checkver:
 .endif  .endif
   
   print-shlib-major:
   .if defined(SHLIB_MAJOR)
           @echo ${SHLIB_MAJOR}
 .else  .else
 checkver:          @false
   .endif
   
   print-shlib-minor:
   .if defined(SHLIB_MINOR)
           @echo ${SHLIB_MINOR}
   .else
           @false
   .endif
   
   print-shlib-teeny:
   .if defined(SHLIB_TEENY)
           @echo ${SHLIB_TEENY}
   .else
           @false
   .endif
   
   .if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)
   .if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
   .if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
   SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
   .else
   SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
   .endif
   .else
   SHLIB_FULLVERSION=${SHLIB_MAJOR}
   .endif
 .endif  .endif
   
 # add additional suffixes not exported.  # add additional suffixes not exported.
Line 49  checkver:
Line 83  checkver:
 # OBJECT_FMT:           currently either "ELF" or "a.out", from <bsd.own.mk>  # 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}
   #                       [.${SHLIB_TEENY}]]
 # SHLIB_SHFLAGS:        Flags to tell ${LD} to emit shared library.  # SHLIB_SHFLAGS:        Flags to tell ${LD} to emit shared library.
 #                       with ELF, also set shared-lib version for ld.so.  #                       with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors  # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors
Line 77  AINC+=-DABICALLS
Line 112  AINC+=-DABICALLS
 AFLAGS+= -fPIC  AFLAGS+= -fPIC
 AS+=    -KPIC  AS+=    -KPIC
   
 .elif ${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} == "ELF"  .elif ${MACHINE_ARCH} == "vax" && ${OBJECT_FMT} == "ELF"
   # On the VAX, all object are PIC by default, not just sharedlibs.
   MKPICLIB= no
   
   .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \
          ${OBJECT_FMT} == "ELF"
   
 CPICFLAGS ?= -fPIC -DPIC  CPICFLAGS ?= -fPIC -DPIC
 CPPPICFLAGS?= -DPIC  CPPPICFLAGS?= -DPIC
Line 89  APICFLAGS ?= -KPIC
Line 129  APICFLAGS ?= -KPIC
 # Platform-independent flags for NetBSD a.out shared libraries (and PowerPC)  # Platform-independent flags for NetBSD a.out shared libraries (and PowerPC)
 SHLIB_LDSTARTFILE=  SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=  SHLIB_LDENDFILE=
   SHLIB_SOVERSION=${SHLIB_FULLVERSION}
 SHLIB_SHFLAGS=  SHLIB_SHFLAGS=
 SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}  
 CPICFLAGS?= -fPIC -DPIC  CPICFLAGS?= -fPIC -DPIC
 CPPPICFLAGS?= -DPIC  CPPPICFLAGS?= -DPIC
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}  CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
Line 243  SOLIB=lib${LIB}_pic.a
Line 283  SOLIB=lib${LIB}_pic.a
 _LIBS+=${SOLIB}  _LIBS+=${SOLIB}
 SOBJS+=${OBJS:.o=.so}  SOBJS+=${OBJS:.o=.so}
 .endif  .endif
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)  .if defined(SHLIB_FULLVERSION)
 _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif  .endif
 .endif  .endif
   
Line 289  lib${LIB}_p.a:: ${POBJS} __archivebuild
Line 329  lib${LIB}_p.a:: ${POBJS} __archivebuild
 lib${LIB}_pic.a:: ${SOBJS} __archivebuild  lib${LIB}_pic.a:: ${SOBJS} __archivebuild
         @echo building shared object ${LIB} library          @echo building shared object ${LIB} library
   
 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOLIB} ${DPADD} \  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
     ${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_FULLVERSION}\)
         @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}          @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \          $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             ${SHLIB_LDSTARTFILE} \              ${SHLIB_LDSTARTFILE} \
             --whole-archive ${SOLIB} \              --whole-archive ${SOLIB} \
             -L${DESTDIR}${LIBDIR} -R${LIBDIR} \  
             --no-whole-archive ${LDADD} \              --no-whole-archive ${LDADD} \
               -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
             ${SHLIB_LDENDFILE}              ${SHLIB_LDENDFILE}
 .else  .else
         $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \          $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
Line 307  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
Line 347  lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
             ${SHLIB_LDENDFILE}              ${SHLIB_LDENDFILE}
 .endif  .endif
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
         rm -f lib${LIB}.so.${SHLIB_MAJOR}          ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
         ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \          mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
             lib${LIB}.so.${SHLIB_MAJOR}          ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
         rm -f lib${LIB}.so          mv -f lib${LIB}.so.tmp lib${LIB}.so
         ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \  
             lib${LIB}.so  
 .endif  .endif
   
 LLIBS?=         -lc  LLIBS?=         -lc
Line 385  ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib
Line 423  ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib
 .endif  .endif
 .endif  .endif
   
 .if ${MKPIC} != "no" && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)  .if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  .PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .if !defined(UPDATE)  .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif  .endif
   
 .if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR})  .if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_FULLVERSION})
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: .MADE
 .endif  .endif
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
         ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \          ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
             -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${.TARGET}              -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${.TARGET}
 .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)  .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
         /sbin/ldconfig -m ${LIBDIR}          /sbin/ldconfig -m ${LIBDIR}
 .endif  .endif
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
         rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}          ln -sf lib${LIB}.so.${SHLIB_FULLVERSION}\
         ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \              ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.tmp
           mv -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.tmp\
             ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}              ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
         rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so  
 .if ${MKLINKLIB} != "no"  .if ${MKLINKLIB} != "no"
         ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \          ln -sf lib${LIB}.so.${SHLIB_FULLVERSION}\
               ${DESTDIR}${LIBDIR}/lib${LIB}.so.tmp
           mv -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.tmp\
             ${DESTDIR}${LIBDIR}/lib${LIB}.so              ${DESTDIR}${LIBDIR}/lib${LIB}.so
 .endif  .endif
 .endif  .endif
Legend:
Removed from v.1.168  
changed lines
  Added in v.1.178
CVSweb <webmaster@jp.NetBSD.org>