From: bluhm Date: Fri, 7 Jul 2017 23:15:27 +0000 (+0000) Subject: Remove useless make depend targets. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1a1df6393e0c865b3bd533cc019a70ad3fa9f991;p=openbsd Remove useless make depend targets. --- diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile index 5951d6a27ce..70077bf101e 100644 --- a/regress/sys/kern/Makefile +++ b/regress/sys/kern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.69 2017/04/30 09:03:58 mpi Exp $ +# $OpenBSD: Makefile,v 1.70 2017/07/07 23:15:27 bluhm Exp $ SUBDIR+= __syscall access accept dup2 dup2_self exec_self execve exit extent SUBDIR+= fchdir @@ -11,7 +11,7 @@ SUBDIR+= main-thread-exited SUBDIR+= mmap mmap2 mmap3 mmap-fail SUBDIR+= mount SUBDIR+= nanosleep noexec -#SUBDIR+= pledge +SUBDIR+= pledge SUBDIR+= pread preadv ptmget pty pwrite pwritev rcvtimeo SUBDIR+= rlimit-file signal signal-stress sigprof sigsuspend SUBDIR+= sosplice @@ -22,7 +22,7 @@ SUBDIR+= unixsock bind # The setuid subtest creates set user/group id binaries in the obj directory. # Do not run this test by default, it may trigger alerts from daily security. -.ifmake clean || cleandir || depend || obj +.ifmake clean || cleandir || obj SUBDIR+= setuid .endif diff --git a/regress/sys/kern/setuid/Makefile b/regress/sys/kern/setuid/Makefile index 2429092f962..376e0d3479c 100644 --- a/regress/sys/kern/setuid/Makefile +++ b/regress/sys/kern/setuid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/11/28 22:27:10 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2017/07/07 23:15:27 bluhm Exp $ MOUNT_NOSUID != mount | grep ^$$(df -P /tmp | tail -1 | awk '{ print $$1 }') |\ grep nosuid || true @@ -64,7 +64,7 @@ BINFILES+= setgid_exec_inherit CLEANFILES+= *.o ${BINFILES} -.ifmake !clean && !cleandir && !depend && !obj +.ifmake !clean && !cleandir && !obj DIR !!= mktemp -d -t setuid-regress-XXXXXXXXXX .BEGIN: @chmod 755 ${DIR} diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile index 6e15ce9fa16..6de86873c6e 100644 --- a/regress/sys/net/pf_forward/Makefile +++ b/regress/sys/net/pf_forward/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2017/05/15 13:10:33 bluhm Exp $ +# $OpenBSD: Makefile,v 1.24 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -105,8 +105,6 @@ regress: .endif .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/net/pf_fragment/Makefile b/regress/sys/net/pf_fragment/Makefile index f5919e69f9c..52d721431cf 100644 --- a/regress/sys/net/pf_fragment/Makefile +++ b/regress/sys/net/pf_fragment/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2016/10/19 14:31:19 tb Exp $ +# $OpenBSD: Makefile,v 1.23 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -90,8 +90,6 @@ regress: .endif .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/net/pf_print/Makefile b/regress/sys/net/pf_print/Makefile index 2ffe825506e..3f3b836f287 100644 --- a/regress/sys/net/pf_print/Makefile +++ b/regress/sys/net/pf_print/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2016/08/24 22:31:41 bluhm Exp $ +# $OpenBSD: Makefile,v 1.2 2017/07/07 23:15:27 bluhm Exp $ PROG= pf_print_test CLEANFILES= pf_print_host.c @@ -10,8 +10,6 @@ pf_print_host.c: ../../../../sys/net/pf.c Makefile ${.CURDIR}/../../../../sys/net/pf.c >$@.tmp mv $@.tmp $@ -beforedepend: pf_print_host.c - pf_print_test.o: pf_print_test.c pf_print_host.c .include diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile index 3b1f741378b..03bf03ec7d2 100644 --- a/regress/sys/net/pf_state/Makefile +++ b/regress/sys/net/pf_state/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2017/02/27 23:05:21 bluhm Exp $ +# $OpenBSD: Makefile,v 1.6 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -77,8 +77,6 @@ regress: rm -f stamp-pfctl .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/net/pf_table/Makefile b/regress/sys/net/pf_table/Makefile index 43f282ffd61..a71f0190c73 100644 --- a/regress/sys/net/pf_table/Makefile +++ b/regress/sys/net/pf_table/Makefile @@ -1,26 +1,17 @@ -# $OpenBSD: Makefile,v 1.2 2017/04/19 12:44:05 bluhm Exp $ +# $OpenBSD: Makefile,v 1.3 2017/07/07 23:15:27 bluhm Exp $ -REGRESS_TARGETS= hit miss -REGRESS_ROOT_TARGETS= hit miss +REGRESS_TARGETS= hit miss cleanup +CLEANFILES= stamp-* -.ifmake !obj && !clean && !cleandir && !depend && !regress -.if (${.TARGET} != all && ! make(all)) || (${.TARGET} == all) - -.SILENT: .BEGIN .END .INTERRUPT - -.BEGIN: +stamp-setup: ${SUDO} pfctl -qt __regress_tbl -T add -f ${.CURDIR}/table.in + date >$@ -.END: +cleanup: + rm -f stamp-setup ${SUDO} pfctl -qt __regress_tbl -T kill -.INTERRUPT: - ${SUDO} pfctl -qt __regress_tbl -T kill - -.endif -.endif - -hit: +hit: stamp-setup for i in `cat ${.CURDIR}/table.hit`; do \ echo -n "hit $$i "; \ ${SUDO} pfctl -qt __regress_tbl -T test $$i || exit 1; \ @@ -28,7 +19,7 @@ hit: done; \ exit 0 -miss: +miss: stamp-setup for i in `cat ${.CURDIR}/table.miss`; do \ echo -n "miss $$i "; \ ${SUDO} pfctl -qt __regress_tbl -T test $$i && exit 1; \ diff --git a/regress/sys/netinet/arp/Makefile b/regress/sys/netinet/arp/Makefile index e26a8a3e288..7081e928b99 100644 --- a/regress/sys/netinet/arp/Makefile +++ b/regress/sys/netinet/arp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/10/19 14:31:19 tb Exp $ +# $OpenBSD: Makefile,v 1.10 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -64,8 +64,6 @@ regress: .endif .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/netinet/ipsec/Makefile b/regress/sys/netinet/ipsec/Makefile index 8ed3ed80eae..304b8a0a9c3 100644 --- a/regress/sys/netinet/ipsec/Makefile +++ b/regress/sys/netinet/ipsec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2017/05/28 21:23:47 bluhm Exp $ +# $OpenBSD: Makefile,v 1.17 2017/07/07 23:15:27 bluhm Exp $ # This test needs a manual setup of four machines, the make # target create-setup can be used distribute the configuration. @@ -167,8 +167,6 @@ regress: rm -f stamp-* .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile @echo '\n======== $@ ========' diff --git a/regress/sys/netinet/pmtu/Makefile b/regress/sys/netinet/pmtu/Makefile index da86f8e031d..447637aa900 100644 --- a/regress/sys/netinet/pmtu/Makefile +++ b/regress/sys/netinet/pmtu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2017/04/16 16:59:53 kettenis Exp $ +# $OpenBSD: Makefile,v 1.11 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -64,8 +64,6 @@ regress: ssh -t ${REMOTE_SSH} ${SUDO} true .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/netinet6/frag6/Makefile b/regress/sys/netinet6/frag6/Makefile index 7061ac670c9..378fd5f0a57 100644 --- a/regress/sys/netinet6/frag6/Makefile +++ b/regress/sys/netinet6/frag6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2017/05/31 09:25:17 bluhm Exp $ +# $OpenBSD: Makefile,v 1.20 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -61,8 +61,6 @@ regress: rm -f stamp-stack stamp-pf .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/netinet6/nd6/Makefile b/regress/sys/netinet6/nd6/Makefile index 22b232876eb..ba7011d8c56 100644 --- a/regress/sys/netinet6/nd6/Makefile +++ b/regress/sys/netinet6/nd6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2017/03/01 00:05:21 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -69,8 +69,6 @@ regress: @echo SKIPPED .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp diff --git a/regress/sys/netinet6/rh0/Makefile b/regress/sys/netinet6/rh0/Makefile index bb4af97059e..d1d4804304c 100644 --- a/regress/sys/netinet6/rh0/Makefile +++ b/regress/sys/netinet6/rh0/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2017/03/01 00:58:22 bluhm Exp $ +# $OpenBSD: Makefile,v 1.11 2017/07/07 23:15:27 bluhm Exp $ # The following ports must be installed: # @@ -68,8 +68,6 @@ regress: rm -f stamp-stack stamp-pf .endif -depend: addr.py - # Create python include file containing the addresses. addr.py: Makefile rm -f $@ $@.tmp