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 7150 by laffer1, Sat Jul 25 20:20:22 2015 UTC vs.
Revision 7151 by laffer1, Sun Jul 26 00:58:07 2015 UTC

# Line 1249 | Line 1249 | gnu/lib/libgcc__L: lib/libc__L
1249   lib/libcxxrt__L: gnu/lib/libgcc__L
1250   .endif
1251  
1252 < _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
1252 > _prebuild_libs= ${_kerberos5_lib_libasn1} \
1253 >                ${_kerberos5_lib_libhdb} \
1254 >                ${_kerberos5_lib_libheimbase} \
1255                  ${_kerberos5_lib_libheimntlm} \
1256 +                ${_kerberos5_lib_libheimsqlite} \
1257 +                ${_kerberos5_lib_libheimipcc} \
1258                  ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
1259                  ${_kerberos5_lib_libroken} \
1260 +                ${_kerberos5_lib_libwind} \
1261                  lib/libbz2 lib/libcom_err lib/libcrypt \
1262 <                lib/libexpat \
1262 >                lib/libelf lib/libexpat \
1263                  ${_lib_libgssapi} ${_lib_libipx} \
1264                  lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
1265                  lib/ncurses/ncurses lib/ncurses/ncursesw \
# Line 1307 | Line 1312 | _secure_lib=   secure/lib
1312   .if ${MK_KERBEROS} != "no"
1313   kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
1314   kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1315 <    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
1316 < kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L
1315 >    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
1316 >    kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L
1317 > kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
1318 >    kerberos5/lib/libroken__L lib/libcom_err__L
1319   kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1320 <    secure/lib/libcrypto__L kerberos5/lib/libroken__L
1320 >    secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
1321   kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1322      lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
1323 <    kerberos5/lib/libroken__L
1323 >    kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
1324 >    kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
1325   kerberos5/lib/libroken__L: lib/libcrypt__L
1326 + kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
1327 + kerberos5/lib/libheimbase__L: lib/libthr__L
1328 + kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
1329 + kerberos5/lib/libheimsqlite__L: lib/libthr__L
1330   .endif
1331  
1332   .if ${MK_GSSAPI} != "no"
# Line 1326 | Line 1338 | _lib_libipx=   lib/libipx
1338   .endif
1339  
1340   .if ${MK_KERBEROS} != "no"
1341 < _kerberos5_lib= kerberos5/lib
1341 > _kerberos5_lib= kerberos5/lib
1342   _kerberos5_lib_libasn1= kerberos5/lib/libasn1
1343   _kerberos5_lib_libhdb= kerberos5/lib/libhdb
1344 + _kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
1345   _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
1346   _kerberos5_lib_libhx509= kerberos5/lib/libhx509
1347   _kerberos5_lib_libroken= kerberos5/lib/libroken
1348   _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
1349 + _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
1350 + _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
1351 + _kerberos5_lib_libwind= kerberos5/lib/libwind
1352 + _libcom_err= lib/libcom_err
1353   .endif
1354  
1355   .if ${MK_NIS} != "no"
# Line 1344 | Line 1361 | lib/libradius__L: lib/libmd__L
1361   .endif
1362  
1363   .for _lib in ${_prereq_libs}
1364 < ${_lib}__PL: .PHONY
1364 > ${_lib}__PL: .PHONY .MAKE
1365   .if exists(${.CURDIR}/${_lib})
1366          ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1367 <                cd ${.CURDIR}/${_lib}; \
1368 <                ${MAKE} DIRPRFX=${_lib}/ obj; \
1369 <                ${MAKE} DIRPRFX=${_lib}/ depend; \
1370 <                ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
1367 >                cd ${.CURDIR}/${_lib} && \
1368 >                ${MAKE} DIRPRFX=${_lib}/ obj && \
1369 >                ${MAKE} DIRPRFX=${_lib}/ depend && \
1370 >                ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
1371                  ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
1372   .endif
1373   .endfor
# Line 1359 | Line 1376 | ${_lib}__PL: .PHONY
1376   ${_lib}__L: .PHONY
1377   .if exists(${.CURDIR}/${_lib})
1378          ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1379 <                cd ${.CURDIR}/${_lib}; \
1380 <                ${MAKE} DIRPRFX=${_lib}/ obj; \
1381 <                ${MAKE} DIRPRFX=${_lib}/ depend; \
1382 <                ${MAKE} DIRPRFX=${_lib}/ all; \
1379 >                cd ${.CURDIR}/${_lib} && \
1380 >                ${MAKE} DIRPRFX=${_lib}/ obj && \
1381 >                ${MAKE} DIRPRFX=${_lib}/ depend && \
1382 >                ${MAKE} DIRPRFX=${_lib}/ all && \
1383                  ${MAKE} DIRPRFX=${_lib}/ install
1384   .endif
1385   .endfor

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines