diff options
| author | ru <ru@FreeBSD.org> | 2006-11-26 14:36:34 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-11-26 14:36:34 +0000 |
| commit | 815d860c2f47f79db9345169bc2c5885333910b7 (patch) | |
| tree | 41cff96be947a8a6e2ac9aff5183efb8a82d6d3b /usr.sbin/Makefile | |
| parent | c2e4cdb2dad69b0a79e0f366b170b021a4cbd8f0 (diff) | |
| download | FreeBSD-src-815d860c2f47f79db9345169bc2c5885333910b7.zip FreeBSD-src-815d860c2f47f79db9345169bc2c5885333910b7.tar.gz | |
- When building world WITHOUT_LIBPTHREAD, link libthr to libpthread.
- Don't build ngctl(8) and cached(8) if threading libs aren't built.
- Fix various issues in a cached(8) makefile.
Diffstat (limited to 'usr.sbin/Makefile')
| -rw-r--r-- | usr.sbin/Makefile | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5d8db93..18ea120 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -105,7 +105,7 @@ SUBDIR= ac \ ${_ndp} \ newsyslog \ nfsd \ - ngctl \ + ${_ngctl} \ nghook \ nologin \ ntp \ @@ -226,10 +226,6 @@ _rndc-confgen= rndc-confgen _bluetooth= bluetooth .endif -.if ${MK_NS_CACHING} != "no" -_cached= cached -.endif - .if ${MK_OPENSSL} != "no" _keyserv= keyserv .endif @@ -267,10 +263,22 @@ _ypset= ypset _authpf= authpf .endif +.if ${MK_LIBTHR} != "no" || \ + (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no") +_ngctl= ngctl +.endif + .if ${MK_LPR} != "no" _lpr= lpr .endif +.if ${MK_NS_CACHING} != "no" +.if ${MK_LIBTHR} != "no" || \ + (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no") +_cached= cached +.endif +.endif + .if ${MK_SENDMAIL} != "no" _editmap= editmap _mailstats= mailstats @@ -305,7 +313,7 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt _pnpinfo= pnpinfo -.if ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" _pppctl= pppctl .endif _sicontrol= sicontrol @@ -341,7 +349,7 @@ _mount_nwfs= mount_nwfs _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt -.if ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" _pppctl= pppctl .endif _sicontrol= sicontrol @@ -355,7 +363,7 @@ _acpi= acpi .endif _kgmon= kgmon _mount_smbfs= mount_smbfs -.if ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" _pppctl= pppctl .endif _zzz= zzz |
