[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.255 and 1.261

version 1.255, 2004/07/29 03:14:04 version 1.261, 2005/05/10 14:54:02
Line 20  LDADD+=     ${LDADD.lib${LIB}}
Line 20  LDADD+=     ${LDADD.lib${LIB}}
 LDFLAGS+=   ${LDFLAGS.lib${LIB}}  LDFLAGS+=   ${LDFLAGS.lib${LIB}}
 LDSTATIC+=  ${LDSTATIC.lib${LIB}}  LDSTATIC+=  ${LDSTATIC.lib${LIB}}
   
   ##### Libraries that this may depend upon.
   .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {
   .for _lib _dir in ${LIBDPLIBS}
   .if !defined(LIBDO.${_lib})
   LIBDO.${_lib}!= cd ${_dir} && ${PRINTOBJDIR}
   .MAKEOVERRIDES+=LIBDO.${_lib}
   .endif
   LDADD+=         -L${LIBDO.${_lib}} -l${_lib}
   DPADD+=         ${LIBDO.${_lib}}/lib${_lib}.so
   .endfor
   .endif                                                                  # }
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .so .ln  MKDEP_SUFFIXES?=        .o .po .so .ln
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
Line 167  SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${DEST
Line 179  SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${DEST
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
   AFLAGS+=        ${COPTS}
 FFLAGS+=        ${FOPTS}  FFLAGS+=        ${FOPTS}
   
 .c.o:  .c.o:
Line 570  ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
Line 583  ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
                 ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}                  ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 .if ${_LIBSODIR} != ${LIBDIR}  .if ${_LIBSODIR} != ${LIBDIR}
         ${INSTALL_SYMLINK} ${SYSPKGTAG} \          ${INSTALL_SYMLINK} ${SYSPKGTAG} \
                 ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \                  -l r ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
                 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}                  ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif  .endif
 .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)  .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
Line 591  ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
Line 604  ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
                 ${DESTDIR}${_LIBSODIR}/lib${LIB}.so                  ${DESTDIR}${_LIBSODIR}/lib${LIB}.so
 .if ${_LIBSODIR} != ${LIBDIR}  .if ${_LIBSODIR} != ${LIBDIR}
         ${INSTALL_SYMLINK} ${SYSPKGTAG} \          ${INSTALL_SYMLINK} ${SYSPKGTAG} \
                 ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \                  -l r ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
                 ${DESTDIR}${LIBDIR}/lib${LIB}.so                  ${DESTDIR}${LIBDIR}/lib${LIB}.so
 .endif  .endif
 .endif  .endif
Legend:
Removed from v.1.255  
changed lines
  Added in v.1.261
CVSweb <webmaster@jp.NetBSD.org>