diff options
| author | uqs <uqs@FreeBSD.org> | 2010-03-02 16:58:04 +0000 |
|---|---|---|
| committer | uqs <uqs@FreeBSD.org> | 2010-03-02 16:58:04 +0000 |
| commit | f8d1dd7a4ec434051b6212ce3eb8499b4799cb6b (patch) | |
| tree | 360810296710b0ace559e49a0c503b4bcfdf7f05 /tools/tools | |
| parent | 1a096d21d2dc8c7098da304d2c62ec61a9ef76ad (diff) | |
| download | FreeBSD-src-f8d1dd7a4ec434051b6212ce3eb8499b4799cb6b.zip FreeBSD-src-f8d1dd7a4ec434051b6212ce3eb8499b4799cb6b.tar.gz | |
Always assign WARNS using ?=
- fix some nearby style bugs
- include Makefile.inc where it makes sense and reduces duplication
Approved by: ed (co-mentor)
Diffstat (limited to 'tools/tools')
| -rw-r--r-- | tools/tools/netrate/http/Makefile | 2 | ||||
| -rw-r--r-- | tools/tools/netrate/httpd/Makefile | 2 | ||||
| -rw-r--r-- | tools/tools/netrate/juggle/Makefile | 5 | ||||
| -rw-r--r-- | tools/tools/netrate/tcpconnect/Makefile | 2 | ||||
| -rw-r--r-- | tools/tools/netrate/tcpp/Makefile | 2 | ||||
| -rw-r--r-- | tools/tools/netrate/tcpreceive/Makefile | 2 | ||||
| -rw-r--r-- | tools/tools/umastat/Makefile | 3 |
7 files changed, 8 insertions, 10 deletions
diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile index 789e7d0..fb8960b 100644 --- a/tools/tools/netrate/http/Makefile +++ b/tools/tools/netrate/http/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= http -WARNS= 3 NO_MAN= +WARNS?= 3 DPADD= ${LIBPTHREAD} LDADD= -lpthread diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile index 74067f2..b66ad19 100644 --- a/tools/tools/netrate/httpd/Makefile +++ b/tools/tools/netrate/httpd/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= httpd -WARNS= 3 NO_MAN= +WARNS?= 3 DPADD= ${LIBPTHREAD} LDADD= -lpthread diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile index 67d6263..cd64a07 100644 --- a/tools/tools/netrate/juggle/Makefile +++ b/tools/tools/netrate/juggle/Makefile @@ -2,9 +2,8 @@ PROG= juggle NO_MAN= -WARNS= 3 - -LDADD= -lpthread +WARNS?= 3 DPADD= ${LIBPTHREAD} +LDADD= -lpthread .include <bsd.prog.mk> diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile index 4a3f5ad..624c94a 100644 --- a/tools/tools/netrate/tcpconnect/Makefile +++ b/tools/tools/netrate/tcpconnect/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tcpconnect -WARNS= 3 NO_MAN= +WARNS?= 3 .include <bsd.prog.mk> diff --git a/tools/tools/netrate/tcpp/Makefile b/tools/tools/netrate/tcpp/Makefile index 31f8fc2..a0b2715 100644 --- a/tools/tools/netrate/tcpp/Makefile +++ b/tools/tools/netrate/tcpp/Makefile @@ -4,6 +4,6 @@ PROG= tcpp INCS= tcpp.h NO_MAN= SRCS= tcpp.c tcpp_client.c tcpp_server.c tcpp_util.c -WARNS= 3 +WARNS?= 3 .include <bsd.prog.mk> diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile index 06d58ce..f04ea5f 100644 --- a/tools/tools/netrate/tcpreceive/Makefile +++ b/tools/tools/netrate/tcpreceive/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tcpreceive -WARNS= 3 NO_MAN= +WARNS?= 3 .include <bsd.prog.mk> diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile index 9461173..2335673 100644 --- a/tools/tools/umastat/Makefile +++ b/tools/tools/umastat/Makefile @@ -2,10 +2,9 @@ PROG= umastat NO_MAN= +WARNS?= 3 DPADD= ${LIBKVM} LDADD= -lkvm -WARNS= 3 - .include <bsd.prog.mk> |
