[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.291 and 1.294

version 1.291, 2008/12/06 19:32:05 version 1.294, 2009/01/17 12:07:59
Line 69  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
Line 69  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .so .go .ln  MKDEP_SUFFIXES?=        .o .po .so .go .ln
   
   # Use purely kernel private headers in rump builds
   .if !defined(RUMPKERNEL)
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}  CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
   .endif
   
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {  .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
Line 432  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 436  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
   
   # If you change this, please consider reflecting the change in
   # the override in sys/rump/Makefile.rump.
 .if !target(__archivebuild)  .if !target(__archivebuild)
 __archivebuild: .USE  __archivebuild: .USE
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
Line 505  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 511  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
         rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             ${_LIBLDOPTS} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \  
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${LDADD} \
               ${_LIBLDOPTS} ${LDFLAGS} \
             -L${_GCC_LIBGCCDIR}              -L${_GCC_LIBGCCDIR}
 .else  .else
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \

Legend:
Removed from v.1.291  
changed lines
  Added in v.1.294

CVSweb <webmaster@jp.NetBSD.org>