diff options
| -rw-r--r-- | Makefile.inc1 | 3 | ||||
| -rw-r--r-- | lib/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 6 | ||||
| -rw-r--r-- | usr.bin/Makefile | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d225474..f5a8479 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1254,7 +1254,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - lib/libbz2 lib/libcom_err lib/libcrypt \ + lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ @@ -1341,6 +1341,7 @@ _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind +_libcom_err= lib/libcom_err .endif .if ${MK_NIS} != "no" diff --git a/lib/Makefile b/lib/Makefile index ba2f905..0c3e389 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -33,7 +33,6 @@ SUBDIR_ORDERED= ${_csu} \ libc \ libbsm \ libauditd \ - libcom_err \ libcompiler_rt \ libcrypt \ libelf \ @@ -52,6 +51,10 @@ SUBDIR_ORDERED= ${_csu} \ ${_libcxxrt} \ ${_libcplusplus} +.if ${MK_KERBEROS_SUPPORT} != "no" +SUBDIR_ORDERED+= libcom_err +.endif + SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 98109ec..583a647 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2184,6 +2184,7 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz .endif .if ${MK_KERBEROS} == no +OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/bin/hxtool OLD_FILES+=usr/bin/kadmin OLD_FILES+=usr/bin/kdestroy @@ -2266,6 +2267,11 @@ OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so OLD_LIBS+=usr/lib/libasn1.so.10 OLD_FILES+=usr/lib/libasn1_p.a +OLD_FILES+=usr/lib/libcom_err.a +OLD_FILES+=usr/lib/libcom_err.so +OLD_LIBS+=usr/lib/libcom_err.so.5 +OLD_FILES+=usr/lib/libcom_err_p.a +OLD_FILES+=usr/lib/libcom_err_p.a OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_FILES+=usr/lib/libgssapi_krb5.so OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 diff --git a/usr.bin/Makefile b/usr.bin/Makefile index b957cf7..85fb6e6 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -261,6 +261,10 @@ SUBDIR+= csup SUBDIR+= locate .endif +.if ${MK_KERBEROS_SUPPORT} != "no" +SUBDIR+= compile_et +.endif + # XXX msgs? .if ${MK_MAIL} != "no" SUBDIR+= biff @@ -317,7 +321,6 @@ SUBDIR+= ul SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 -SUBDIR+= compile_et SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof |
