From: espie Date: Sun, 9 Jul 2017 21:23:18 +0000 (+0000) Subject: remove redundant variable declarations in Makefiles, since those are X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=58a577e134e547a26e8dc989e82b033058e883e8;p=openbsd remove redundant variable declarations in Makefiles, since those are the default. okay millert@ --- diff --git a/bin/date/Makefile b/bin/date/Makefile index 1c3559af8d4..29216edce7a 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2011/07/07 21:00:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2017/07/09 21:23:18 espie Exp $ PROG= date -SRCS= date.c DPADD+= ${LIBUTIL} LDADD+= -lutil diff --git a/bin/expr/Makefile b/bin/expr/Makefile index ec49f36c2c7..b345af0d256 100644 --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:35:07 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ PROG= expr -SRCS= expr.c .include diff --git a/bin/test/Makefile b/bin/test/Makefile index 3777296fb8c..f603470f2c3 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 2016/03/30 06:38:40 jmc Exp $ +# $OpenBSD: Makefile,v 1.6 2017/07/09 21:23:19 espie Exp $ PROG= test -SRCS= test.c LINKS= ${BINDIR}/test ${BINDIR}/[ .include diff --git a/sbin/atactl/Makefile b/sbin/atactl/Makefile index d04a4ccdf40..2f49ebf9a6e 100644 --- a/sbin/atactl/Makefile +++ b/sbin/atactl/Makefile @@ -1,8 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 1999/09/21 04:58:14 csapuntz Exp $ +# $OpenBSD: Makefile,v 1.2 2017/07/09 21:23:19 espie Exp $ # $NetBSD: Makefile,v 1.1 1998/11/19 23:54:59 kenh Exp $ -SRCS= atactl.c - PROG= atactl MAN= atactl.8 diff --git a/sbin/bioctl/Makefile b/sbin/bioctl/Makefile index 11cdf6b97ce..247ac2a63f2 100644 --- a/sbin/bioctl/Makefile +++ b/sbin/bioctl/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.13 2014/01/18 05:54:51 martynas Exp $ +# $OpenBSD: Makefile,v 1.14 2017/07/09 21:23:19 espie Exp $ PROG= bioctl -SRCS= bioctl.c LDADD= -lutil DPADD= ${LIBUTIL} diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index 0344868ab6e..2c50fb22cd3 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -2,11 +2,10 @@ # # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $ # $FreeBSD: src/sbin/growfs/Makefile,v 1.4 2001/12/04 02:19:47 obrien Exp $ -# $OpenBSD: Makefile,v 1.8 2015/11/23 18:35:18 mmcc Exp $ +# $OpenBSD: Makefile,v 1.9 2017/07/09 21:23:19 espie Exp $ # PROG= growfs -SRCS= growfs.c MAN= growfs.8 #CFLAGS+=-Wall diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile index ba13adedb09..1cc966ea4a5 100644 --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.7 2014/07/14 06:39:23 jmc Exp $ +# $OpenBSD: Makefile,v 1.8 2017/07/09 21:23:19 espie Exp $ PROG= mount -SRCS= mount.c DPADD= ${LIBUTIL} LDADD= -lutil MAN= mount.8 diff --git a/sbin/mount_vnd/Makefile b/sbin/mount_vnd/Makefile index c49ebd35937..6955c74d652 100644 --- a/sbin/mount_vnd/Makefile +++ b/sbin/mount_vnd/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/30 06:38:43 jmc Exp $ +# $OpenBSD: Makefile,v 1.10 2017/07/09 21:23:19 espie Exp $ PROG= mount_vnd -SRCS= mount_vnd.c LDADD= -lutil DPADD= ${LIBUTIL} diff --git a/sbin/scan_ffs/Makefile b/sbin/scan_ffs/Makefile index b97efad106e..024ac70fbf9 100644 --- a/sbin/scan_ffs/Makefile +++ b/sbin/scan_ffs/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 1998/02/05 17:15:51 weingart Exp $ +# $OpenBSD: Makefile,v 1.3 2017/07/09 21:23:19 espie Exp $ PROG= scan_ffs -SRCS= scan_ffs.c DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile index 63ce2f5b974..9e93c6dbdd3 100644 --- a/usr.bin/cap_mkdb/Makefile +++ b/usr.bin/cap_mkdb/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.5 2015/12/04 13:58:09 nicm Exp $ +# $OpenBSD: Makefile,v 1.6 2017/07/09 21:23:19 espie Exp $ PROG= cap_mkdb -SRCS= cap_mkdb.c .include diff --git a/usr.bin/encrypt/Makefile b/usr.bin/encrypt/Makefile index 94c267aaaa3..b85bd930877 100644 --- a/usr.bin/encrypt/Makefile +++ b/usr.bin/encrypt/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.9 2015/10/12 13:53:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2017/07/09 21:23:19 espie Exp $ PROG= encrypt -SRCS= encrypt.c .include diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile index 9e40aa054d2..11c2aea69be 100644 --- a/usr.bin/fmt/Makefile +++ b/usr.bin/fmt/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.4 1998/04/25 23:08:26 millert Exp $ +# $OpenBSD: Makefile,v 1.5 2017/07/09 21:23:19 espie Exp $ PROG= fmt -SRCS= fmt.c .include diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile index 2adb7e9e0e2..39b43026a56 100644 --- a/usr.bin/gencat/Makefile +++ b/usr.bin/gencat/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:49:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2017/07/09 21:23:19 espie Exp $ PROG= gencat -MAN= gencat.1 .include diff --git a/usr.bin/htpasswd/Makefile b/usr.bin/htpasswd/Makefile index 634880e489a..2e078ecd4cb 100644 --- a/usr.bin/htpasswd/Makefile +++ b/usr.bin/htpasswd/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2017/04/16 10:19:54 jsg Exp $ +# $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ + PROG= htpasswd -SRCS= htpasswd.c -MAN= htpasswd.1 CFLAGS+= -W -Wall CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations diff --git a/usr.bin/keynote/Makefile b/usr.bin/keynote/Makefile index 1da7d0d31dc..10f73818221 100644 --- a/usr.bin/keynote/Makefile +++ b/usr.bin/keynote/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2004/06/28 18:36:05 msf Exp $ +# $OpenBSD: Makefile,v 1.14 2017/07/09 21:23:19 espie Exp $ PROG= keynote SRCS= keynote-sign.c keynote-keygen.c keynote-sigver.c keynote-verify.c \ @@ -9,7 +9,6 @@ YACCFLAGS= -d -p kv -b z DPADD= ${LIBKEYNOTE} ${LIBM} ${LIBCRYPTO} LDADD= -lkeynote -lm -lcrypto CLEANFILES+= lex.kv.c z.tab.c z.tab.h -MAN= keynote.1 .PATH: ${.CURDIR}/../../lib/libkeynote diff --git a/usr.bin/less/lesskey/Makefile b/usr.bin/less/lesskey/Makefile index 157ef828aef..2bfbe8cf43a 100644 --- a/usr.bin/less/lesskey/Makefile +++ b/usr.bin/less/lesskey/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2015/11/23 09:24:48 nicm Exp $ +# $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ .PATH: ${.CURDIR}/.. PROG= lesskey SRCS= lesskey.c version.c -MAN= lesskey.1 BINDIR= /usr/bin CFLAGS+=-I${.CURDIR}/.. diff --git a/usr.bin/openssl/Makefile b/usr.bin/openssl/Makefile index c862418768f..11ecd1b96ca 100644 --- a/usr.bin/openssl/Makefile +++ b/usr.bin/openssl/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2017/05/07 04:18:47 jsg Exp $ +# $OpenBSD: Makefile,v 1.9 2017/07/09 21:23:19 espie Exp $ .include PROG= openssl LDADD= -lssl -lcrypto DPADD= ${LIBSSL} ${LIBCRYPTO} -MAN1= openssl.1 CFLAGS+= -Wall CFLAGS+= -Wformat diff --git a/usr.bin/pkill/Makefile b/usr.bin/pkill/Makefile index 36d4a5f90e3..e504cff5f5a 100644 --- a/usr.bin/pkill/Makefile +++ b/usr.bin/pkill/Makefile @@ -1,9 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2016/03/30 06:38:46 jmc Exp $ +# $OpenBSD: Makefile,v 1.3 2017/07/09 21:23:19 espie Exp $ # $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $ PROG= pkill -SRCS= pkill.c -MAN= pkill.1 LDADD+= -lkvm DPADD+= ${LIBKVM} diff --git a/usr.bin/tcpbench/Makefile b/usr.bin/tcpbench/Makefile index 9b195deac9f..70d5ef19208 100644 --- a/usr.bin/tcpbench/Makefile +++ b/usr.bin/tcpbench/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.7 2015/11/17 15:41:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2017/07/09 21:23:19 espie Exp $ PROG= tcpbench -MAN= tcpbench.1 LDADD= -lkvm -levent DPADD= ${LIBKVM} ${LIBEVENT} diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile index 6e3466d8443..95eca38dee0 100644 --- a/usr.bin/true/Makefile +++ b/usr.bin/true/Makefile @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile,v 1.5 2015/11/11 19:05:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2017/07/09 21:23:19 espie Exp $ -MAN= true.1 PROG= true .include diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile index 23e36f5e7db..0c577709fbd 100644 --- a/usr.bin/tsort/Makefile +++ b/usr.bin/tsort/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.6 2014/05/12 19:11:20 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2017/07/09 21:23:19 espie Exp $ PROG = tsort -SRCS = tsort.c CDIAGFLAGS = -Wall -Wno-char-subscripts -Wstrict-prototypes -pedantic -W DPADD += ${LIBUTIL} diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile index e0e599c24a2..034475f726d 100644 --- a/usr.bin/usbhidaction/Makefile +++ b/usr.bin/usbhidaction/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2015/10/26 10:32:56 tedu Exp $ +# $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ # $NetBSD: Makefile,v 1.4 2002/02/02 16:54:26 veego Exp $ PROG= usbhidaction -SRCS= usbhidaction.c LDADD+= -lusbhid DPADD+= ${LIBUSBHID} diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 33160b66e2e..865cfbb6ddc 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.7 2011/11/08 10:37:10 guenther Exp $ +# $OpenBSD: Makefile,v 1.8 2017/07/09 21:23:19 espie Exp $ PROG= xinstall -SRCS= xinstall.c MAN= install.1 realinstall: diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile index 91837e38705..8ad2190e73f 100644 --- a/usr.bin/ypwhich/Makefile +++ b/usr.bin/ypwhich/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2015/09/09 15:33:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2017/07/09 21:23:19 espie Exp $ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 PROG= ypwhich SRCS= ypwhich.c yplib_host.c -MAN= ypwhich.1 .PATH: ${.CURDIR}/../../usr.sbin/ypserv/common CFLAGS+=-I${.CURDIR}/../../usr.sbin/ypserv/common