ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile.inc1
(Generate patch)

Comparing trunk/Makefile.inc1 (file contents):
Revision 4119 by laffer1, Sun Mar 13 17:16:38 2011 UTC vs.
Revision 4120 by laffer1, Sat Aug 13 21:20:12 2011 UTC

# Line 1 | Line 1
1   #
2   # $FreeBSD: src/Makefile.inc1,v 1.499.2.7 2006/01/07 19:40:08 netchild Exp $
3 < # $MidnightBSD: src/Makefile.inc1,v 1.28 2011/03/13 02:05:39 laffer1 Exp $
3 > # $MidnightBSD: src/Makefile.inc1,v 1.29 2011/03/13 17:16:38 laffer1 Exp $
4   #
5   # Make command line options:
6   #       -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# Line 458 | Line 458 | build32:
458          cd ${.CURDIR}; \
459              ${LIB32WMAKE} -f Makefile.inc1 libraries
460   .for _t in obj depend all
461 <        cd ${.CURDIR}/libexec/rtld-elf; \
462 <            PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
461 >        cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
462 >        cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t}
463   .endfor
464  
465   distribute32 install32:
# Line 473 | Line 473 | distribute32 install32:
473   .if ${MK_CRYPT} != "no"
474          cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
475   .endif
476 + .if ${MK_KERBEROS} != "no"
477 +        cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
478 + .endif
479          cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
480 +        cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//}
481   .endif
482  
483  
# Line 1002 | Line 1006 | _prebuild_libs=        ${_kerberos5_lib_libasn1} ${_kerberos5
1006                  ${_lib_libypclnt} lib/libz lib/msun \
1007                  ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
1008                  ${_secure_lib_libssl} lib/libsqlite3 lib/liblzma \
1009 <                lib/libarchive lib/libfetch
1009 >                lib/libarchive lib/libfetch lib/libmagic
1010  
1011   .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
1012   _default_thread_lib=    lib/${DEFAULT_THREAD_LIB}

Comparing trunk/Makefile.inc1 (property cvs2svn:cvs-rev):
Revision 4119 by laffer1, Sun Mar 13 17:16:38 2011 UTC vs.
Revision 4120 by laffer1, Sat Aug 13 21:20:12 2011 UTC

# Line 1 | Line 1
1 < 1.29
1 > 1.30

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines