From 186e29d5ec91e4d773cee4e8d674351727eba759 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 3 Jul 2017 22:21:47 +0000 Subject: [PATCH] no need to generate y.tab.h if nothing uses it, set YFLAGS to nothing instead of CLEANFILES += y.tab.h okay millert@ --- bin/chio/Makefile | 3 ++- sbin/iked/Makefile | 6 ++++-- usr.bin/doas/Makefile | 3 ++- usr.sbin/acme-client/Makefile | 3 ++- usr.sbin/httpd/Makefile | 4 ++-- usr.sbin/ldapctl/Makefile | 3 ++- usr.sbin/npppd/npppd/Makefile | 3 ++- usr.sbin/relayd/Makefile | 4 ++-- usr.sbin/sasyncd/Makefile | 4 ++-- usr.sbin/smtpd/smtpctl/Makefile | 3 ++- usr.sbin/snmpd/Makefile | 4 ++-- usr.sbin/switchd/Makefile | 3 ++- usr.sbin/vmd/Makefile | 4 ++-- usr.sbin/ypldap/Makefile | 3 ++- 14 files changed, 30 insertions(+), 20 deletions(-) diff --git a/bin/chio/Makefile b/bin/chio/Makefile index 4292e90299c..b60431745e2 100644 --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.12 2007/11/02 15:26:07 jmc Exp $ +# $OpenBSD: Makefile,v 1.13 2017/07/03 22:21:47 espie Exp $ PROG= chio SRCS= chio.c parse.y DPADD= ${LIBUTIL} LDADD= -lutil MAN= chio.1 chio.conf.5 +YFLAGS= .include diff --git a/sbin/iked/Makefile b/sbin/iked/Makefile index d188b58b882..1b0d17ead5c 100644 --- a/sbin/iked/Makefile +++ b/sbin/iked/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2015/10/23 09:13:00 tedu Exp $ +# $OpenBSD: Makefile,v 1.16 2017/07/03 22:21:47 espie Exp $ PROG= iked SRCS= ca.c chap_ms.c config.c control.c crypto.c dh.c \ @@ -17,9 +17,11 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare -CLEANFILES+= y.tab.h ikev2_map.c eap_map.c +CLEANFILES+= ikev2_map.c eap_map.c GENERATED= ikev2_map.c eap_map.c +YFLAGS= + ikev2_map.c: genmap.sh ikev2.h /bin/sh ${.CURDIR}/genmap.sh ${.CURDIR}/ikev2.h ikev2 > $@ @touch $@ diff --git a/usr.bin/doas/Makefile b/usr.bin/doas/Makefile index 7fc38df14c7..f2e5529d6ab 100644 --- a/usr.bin/doas/Makefile +++ b/usr.bin/doas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/06/16 17:40:30 tedu Exp $ +# $OpenBSD: Makefile,v 1.3 2017/07/03 22:21:47 espie Exp $ SRCS= parse.y doas.c env.c @@ -10,5 +10,6 @@ BINMODE=4555 CFLAGS+= -I${.CURDIR} COPTS+= -Wall +YFLAGS= .include diff --git a/usr.sbin/acme-client/Makefile b/usr.sbin/acme-client/Makefile index 31d5b2bf605..ea6c3ae6683 100644 --- a/usr.sbin/acme-client/Makefile +++ b/usr.sbin/acme-client/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2017/01/21 08:41:42 benno Exp $ +# $OpenBSD: Makefile,v 1.8 2017/07/03 22:21:47 espie Exp $ PROG= acme-client SRCS= acctproc.c base64.c certproc.c chngproc.c dbg.c dnsproc.c SRCS+= fileproc.c http.c jsmn.c json.c keyproc.c main.c netproc.c @@ -14,5 +14,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith CFLAGS+= -Wsign-compare -Wunused +YFLAGS= .include diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile index 17cb0f78ebe..376667567d5 100644 --- a/usr.sbin/httpd/Makefile +++ b/usr.sbin/httpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2016/09/28 12:02:17 reyk Exp $ +# $OpenBSD: Makefile,v 1.30 2017/07/03 22:21:47 espie Exp $ PROG= httpd SRCS= parse.y @@ -17,6 +17,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith CFLAGS+= -Wsign-compare -Wcast-qual -CLEANFILES+= y.tab.h +YFLAGS= .include diff --git a/usr.sbin/ldapctl/Makefile b/usr.sbin/ldapctl/Makefile index cce1708717a..32b1f808d99 100644 --- a/usr.sbin/ldapctl/Makefile +++ b/usr.sbin/ldapctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2017/01/20 11:55:08 benno Exp $ +# $OpenBSD: Makefile,v 1.9 2017/07/03 22:21:47 espie Exp $ .PATH: ${.CURDIR}/../ldapd @@ -14,5 +14,6 @@ CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare +YFLAGS= .include diff --git a/usr.sbin/npppd/npppd/Makefile b/usr.sbin/npppd/npppd/Makefile index eadc7f621ce..849f618b489 100644 --- a/usr.sbin/npppd/npppd/Makefile +++ b/usr.sbin/npppd/npppd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2017/05/30 17:52:05 yasuoka Exp $ +# $OpenBSD: Makefile,v 1.21 2017/07/03 22:21:47 espie Exp $ NPPPD_COMMON_DIR= ${.CURDIR}/../common @@ -33,6 +33,7 @@ CPPFLAGS+= -DUSE_NPPPD_PIPEX CPPFLAGS+= -DUSE_NPPPD_RADIUS CPPFLAGS+= -DUSE_SA_COOKIE +YFLAGS= LDADD+= -levent -lradius -lcrypto -ly -lutil DPADD+= ${LIBEVENT} ${LIBRADIUS} ${LIBCRYPTO} ${LIBY} ${LIBUTIL} diff --git a/usr.sbin/relayd/Makefile b/usr.sbin/relayd/Makefile index ee84780d4f6..5f33e639509 100644 --- a/usr.sbin/relayd/Makefile +++ b/usr.sbin/relayd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2017/05/27 08:33:25 claudio Exp $ +# $OpenBSD: Makefile,v 1.32 2017/07/03 22:21:47 espie Exp $ PROG= relayd SRCS= parse.y @@ -16,6 +16,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith CFLAGS+= -Wsign-compare -Wcast-qual -CLEANFILES+= y.tab.h +YFLAGS= .include diff --git a/usr.sbin/sasyncd/Makefile b/usr.sbin/sasyncd/Makefile index 506600208c4..e85aaa6d59d 100644 --- a/usr.sbin/sasyncd/Makefile +++ b/usr.sbin/sasyncd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 2012/08/17 17:11:21 haesbaert Exp $ +# $Id: Makefile,v 1.10 2017/07/03 22:21:47 espie Exp $ PROG= sasyncd SRCS= sasyncd.c carp.c conf.y log.c monitor.c net.c net_ctl.c pfkey.c timer.c @@ -10,7 +10,7 @@ CFLAGS= -O0 $(PIPE) $(DEBUG) CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sbin/iked -CLEANFILES= y.tab.h +YFLAGS= # ElectricFence #LDADD+= -L/usr/local/lib -lefence diff --git a/usr.sbin/smtpd/smtpctl/Makefile b/usr.sbin/smtpd/smtpctl/Makefile index 1285fdb4803..0355bb93fea 100644 --- a/usr.sbin/smtpd/smtpctl/Makefile +++ b/usr.sbin/smtpd/smtpctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2016/03/30 06:38:46 jmc Exp $ +# $OpenBSD: Makefile,v 1.45 2017/07/03 22:21:47 espie Exp $ .PATH: ${.CURDIR}/.. @@ -19,6 +19,7 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare CFLAGS+= -Werror-implicit-function-declaration CFLAGS+= -DNO_IO +YFLAGS= SRCS= enqueue.c SRCS+= parser.c diff --git a/usr.sbin/snmpd/Makefile b/usr.sbin/snmpd/Makefile index 24e3c0889a1..d29da8eaf9d 100644 --- a/usr.sbin/snmpd/Makefile +++ b/usr.sbin/snmpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2014/11/19 10:19:00 blambert Exp $ +# $OpenBSD: Makefile,v 1.15 2017/07/03 22:21:47 espie Exp $ PROG= snmpd MAN= snmpd.8 snmpd.conf.5 @@ -13,6 +13,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare -CLEANFILES+= y.tab.h +YFLAGS= .include diff --git a/usr.sbin/switchd/Makefile b/usr.sbin/switchd/Makefile index 87eacd3749b..41f6436fd46 100644 --- a/usr.sbin/switchd/Makefile +++ b/usr.sbin/switchd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/10/07 08:49:53 reyk Exp $ +# $OpenBSD: Makefile,v 1.7 2017/07/03 22:21:47 espie Exp $ PROG= switchd MAN= switchd.8 switchd.conf.5 @@ -19,6 +19,7 @@ CFLAGS+= -Wsign-compare GENERATED= ofp_map.c ofp10_map.c CLEANFILES+= ${GENERATED} *~ +YFLAGS= ofp_map.c: genmap.sh ${.CURDIR}/ofp_map.h ${.CURDIR}/../../sys/net/ofp.h /bin/sh ${.CURDIR}/genmap.sh -i ${.CURDIR}/../../sys/net/ofp.h -t ofp \ diff --git a/usr.sbin/vmd/Makefile b/usr.sbin/vmd/Makefile index 56f97ea7943..0f100873966 100644 --- a/usr.sbin/vmd/Makefile +++ b/usr.sbin/vmd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2017/05/08 09:08:40 reyk Exp $ +# $OpenBSD: Makefile,v 1.16 2017/07/03 22:21:47 espie Exp $ .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" @@ -17,7 +17,7 @@ CFLAGS+= -Wsign-compare LDADD+= -lutil -lpthread -levent DPADD+= ${LIBUTIL} ${LIBEVENT} -CLEANFILES+= y.tab.h +YFLAGS= .else diff --git a/usr.sbin/ypldap/Makefile b/usr.sbin/ypldap/Makefile index 178ffb1b744..12a286ffbee 100644 --- a/usr.sbin/ypldap/Makefile +++ b/usr.sbin/ypldap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2017/05/30 09:33:31 jmatthew Exp $ +# $OpenBSD: Makefile,v 1.10 2017/07/03 22:21:47 espie Exp $ PROG= ypldap SRCS= parse.y ypldap.c log.c \ @@ -17,5 +17,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare +YFLAGS= .include -- 2.20.1