diff options
author | ru <ru@FreeBSD.org> | 2006-11-27 16:55:14 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-11-27 16:55:14 +0000 |
commit | eeb150355b9cdf227096ba44cee01fb35c24b109 (patch) | |
tree | 410a16f7a613ae731d728387c3181ea1708d0e9c /usr.sbin | |
parent | 6c1cc19152b33b40556371e89b993ae0faf46414 (diff) | |
download | FreeBSD-src-eeb150355b9cdf227096ba44cee01fb35c24b109.zip FreeBSD-src-eeb150355b9cdf227096ba44cee01fb35c24b109.tar.gz |
Push the detection of threading libs support down to ngctl/Makefile
as the latter can be built without threading (with the loss of line
editing functionality).
Pointed by: glebius
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/ngctl/Makefile | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 18ea120..5c45666 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -105,7 +105,7 @@ SUBDIR= ac \ ${_ndp} \ newsyslog \ nfsd \ - ${_ngctl} \ + ngctl \ nghook \ nologin \ ntp \ @@ -263,11 +263,6 @@ _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 diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index 2d24341..bd93699 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $ +.include <bsd.own.mk> + PROG= ngctl MAN= ngctl.8 SRCS= main.c mkpeer.c config.c connect.c dot.c name.c show.c list.c \ @@ -11,6 +13,11 @@ WARNS?= 3 NGCTL_NO_LIBEDIT= .endif +.if ${MK_LIBTHR} == "no" && \ + (${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no") +NGCTL_NO_LIBEDIT= +.endif + DPADD= ${LIBNETGRAPH} LDADD= -lnetgraph |