diff options
author | ru <ru@FreeBSD.org> | 2006-10-07 18:34:08 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-10-07 18:34:08 +0000 |
commit | 12a39f77fdcf67565e779ab27266050e1a6f1e0a (patch) | |
tree | 262b73bb9b417ae8261be3ea770ede760147756a | |
parent | 354e5b83f7d3622ef8bd5fc6920d2177268cba22 (diff) | |
download | FreeBSD-src-12a39f77fdcf67565e779ab27266050e1a6f1e0a.zip FreeBSD-src-12a39f77fdcf67565e779ab27266050e1a6f1e0a.tar.gz |
- Prebuild libgssapi only if building with Kerberos support.
- Remove libnetgraph from the list of prebuilt libraries as
no other library depends on it (snmp_netgraph.so does not
count as we don't build it in the "libraries" target).
- Restore libssh dependencies when compiling with Kerberos
support.
-rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b1a7c20..817528a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1024,15 +1024,16 @@ _prebuild_libs+= lib/libipx _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libkrb5 _prebuild_libs+= kerberos5/lib/libroken +_prebuild_libs+= lib/libgssapi _generic_libs+= kerberos5/lib .endif _prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ + lib/libncurses lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi + lib/libz lib/msun lib/libopie__L lib/libtacplus__L: lib/libmd__L @@ -1046,7 +1047,9 @@ lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L .endif .endif .endif |