From 2e505302fed71ccbc606e78804729f6b344ed695 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 21 Dec 2019 21:40:02 +0000 Subject: a few depend:-related thingies that were still in. okay millert@, tb@ --- Makefile | 4 ++-- distrib/special/more/Makefile | 4 +--- etc/Makefile | 4 ++-- games/wargames/Makefile | 4 ++-- gnu/lib/libstdc++/Makefile.bsd-wrapper | 5 +---- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper | 5 +---- gnu/usr.bin/binutils/Makefile.bsd-wrapper | 5 +---- gnu/usr.bin/cc/doc/Makefile | 5 +---- gnu/usr.bin/cc/include/Makefile | 5 +---- gnu/usr.bin/cc/libgcov/Makefile | 3 +-- gnu/usr.bin/cvs/Makefile.bsd-wrapper | 5 +---- gnu/usr.bin/texinfo/Makefile.bsd-wrapper | 5 +---- lib/librpcsvc/Makefile | 4 +--- share/dict/Makefile | 4 ++-- share/misc/Makefile | 4 ++-- share/snmp/Makefile | 4 ++-- share/tabset/Makefile | 4 ++-- share/tmac/Makefile | 4 ++-- share/tmac/mdoc/Makefile | 4 ++-- usr.bin/infocmp/Makefile | 4 +--- usr.bin/tic/Makefile | 4 +--- usr.bin/tset/Makefile | 4 +--- usr.sbin/bind/Makefile.bsd-wrapper | 5 +---- usr.sbin/nsd/Makefile.bsd-wrapper | 5 +---- usr.sbin/unbound/Makefile.bsd-wrapper | 5 +---- 25 files changed, 34 insertions(+), 75 deletions(-) diff --git a/Makefile b/Makefile index f7c32823df8..2f82f3fe730 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.134 2017/07/05 10:22:32 espie Exp $ +# $OpenBSD: Makefile,v 1.135 2019/12/21 21:39:59 espie Exp $ # # For more information on building in tricky environments, please see @@ -109,6 +109,6 @@ ${CROSS_TARGETS}: .PHONY: ${CROSS_TARGETS} \ build regression-tests includes beforeinstall afterinstall \ - all depend do-build + all do-build .include diff --git a/distrib/special/more/Makefile b/distrib/special/more/Makefile index 9ea0d471644..77f9f3b78b0 100644 --- a/distrib/special/more/Makefile +++ b/distrib/special/more/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/11/15 07:12:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2019/12/21 21:40:00 espie Exp $ PROG= more CFLAGS+= -I. -I${.CURDIR}/ @@ -6,8 +6,6 @@ SRCS= more.c tputs.c termcap.c tgoto.c CLEANFILES+=morehelp.h -beforedepend: morehelp.h - morehelp.h: ${.CURDIR}/more.help echo -n 'const char *more_help = "' > morehelp.h sed -e 's/[\\"]/\\&/g' -e 's/$$/\\n\\/' ${.CURDIR}/more.help >> morehelp.h diff --git a/etc/Makefile b/etc/Makefile index 3f9419aac1e..9f3eee5d9b4 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.475 2019/12/02 02:45:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.476 2019/12/21 21:40:00 espie Exp $ .include @@ -68,7 +68,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \ MISETS= base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz -all clean cleandir depend etc install: +all clean cleandir etc install: install-mtree: ${INSTALL} -c -o root -g wheel -m 600 mtree/special \ diff --git a/games/wargames/Makefile b/games/wargames/Makefile index 7f2385750d9..4894d76d2e9 100644 --- a/games/wargames/Makefile +++ b/games/wargames/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 2017/06/12 18:49:33 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2019/12/21 21:40:00 espie Exp $ NOOBJ= noobj -all wargames clean cleandir depend tags: +all wargames clean cleandir tags: install: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ diff --git a/gnu/lib/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libstdc++/Makefile.bsd-wrapper index 53e41ea2b35..95017ddc178 100644 --- a/gnu/lib/libstdc++/Makefile.bsd-wrapper +++ b/gnu/lib/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2019/12/21 21:40:00 espie Exp $ .include "${.CURDIR}/shlib_version" SHLIB_MAJOR=${major} @@ -61,9 +61,6 @@ config.status: #CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/libstdc++/libmath #SRCS=libmath/stubs.c libmath/nan.c libmath/signbit.c libmath/signbitf.c -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper index b65fbd12f2e..66ebf46803b 100644 --- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2019/05/17 14:47:03 schwarze Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.19 2019/12/21 21:40:00 espie Exp $ .include @@ -138,9 +138,6 @@ clean cleandir: c++filt.1: binutils/doc/cxxfilt.man sed -e 's,@PROGRAM@,c++filt,' <${.CURDIR}/binutils/doc/cxxfilt.man >$@ -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper index e0ce21c2c68..a78e1ae914a 100644 --- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.88 2019/02/24 12:57:13 kn Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.89 2019/12/21 21:40:00 espie Exp $ .include @@ -94,9 +94,6 @@ clean cleandir: c++filt.1: binutils/cxxfilt.man sed -e 's,@PROGRAM@,c++filt,' <${.CURDIR}/binutils/cxxfilt.man >$@ -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile index 22cc323f9fe..cf52a5f87b6 100644 --- a/gnu/usr.bin/cc/doc/Makefile +++ b/gnu/usr.bin/cc/doc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.14.8.1 2009/04/15 03:14:26 kensmith Exp $ -# $OpenBSD: Makefile,v 1.2 2016/11/08 17:39:12 tb Exp $ +# $OpenBSD: Makefile,v 1.3 2019/12/21 21:40:00 espie Exp $ .include @@ -62,9 +62,6 @@ all: ${INFOF} clean: _SUBDIRUSE rm -f ${CLEANFILES} -depend: - # Nothing here so far... - install: ${INFOF} .for x in ${INFOS} install-info --quiet --section=${INFOSECTION} --entry=${INFOENTRY_${x}} \ diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index 47f61f244c5..20186b7a040 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $ -# $OpenBSD: Makefile,v 1.13 2016/11/08 17:39:12 tb Exp $ +# $OpenBSD: Makefile,v 1.14 2019/12/21 21:40:00 espie Exp $ .include @@ -41,9 +41,6 @@ clean: _SUBDIRUSE cleandir: _SUBDIRUSE clean -depend: - # Nothing here so far... - .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" prereq: mm_malloc.h unwind.h .else diff --git a/gnu/usr.bin/cc/libgcov/Makefile b/gnu/usr.bin/cc/libgcov/Makefile index d6b155db871..b1d4f7e8d53 100644 --- a/gnu/usr.bin/cc/libgcov/Makefile +++ b/gnu/usr.bin/cc/libgcov/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.6 2009/06/21 01:54:47 kan Exp $ -# $OpenBSD: Makefile,v 1.3 2017/06/16 10:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2019/12/21 21:40:00 espie Exp $ .include @@ -70,7 +70,6 @@ ${COMMONHDRS}: ${.CURDIR}/../cc_tools/Makefile CLEANFILES += ${COMMONHDRS} CLEANFILES += cs-*.h option* -${OBJS} beforedepend: ${COMMONHDRS} BUILDFIRST = ${COMMONHDRS} BUILDAFTER += ${OBJS_T} ${OBJS_P} ${OBJS_S} diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper index b8add810d15..ee2e7720468 100644 --- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper +++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.58 2018/09/14 13:37:52 naddy Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.59 2019/12/21 21:40:00 espie Exp $ .include @@ -66,9 +66,6 @@ clean cleandir: -@if [ -e Makefile ]; then ${MAKE} distclean; fi rm -f ${CLEANFILES} -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper index aebfc0c498f..11158c4b0d0 100644 --- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper +++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.46 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.47 2019/12/21 21:40:00 espie Exp $ INFODIR= infodir=/usr/share/info INFOPATH= DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:. @@ -67,9 +67,6 @@ clean cleandir: if [ -e ${.OBJDIR}/Makefile ]; then \ $(FSFMAKE) distclean; fi -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 09035be9f71..21c70737972 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2017/06/16 10:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2019/12/21 21:40:00 espie Exp $ RPCSRCS= bootparam_prot.x klm_prot.x mount.x nfs_prot.x \ @@ -11,8 +11,6 @@ CLEANFILES+= ${SRCS} ${HDRS} LIB= rpcsvc NOMAN= -all: ${HDRS} -beforedepend: ${HDRS} prereq: ${HDRS} BUILDFIRST = ${HDRS} diff --git a/share/dict/Makefile b/share/dict/Makefile index 7be863a6d51..819ae4c63b8 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2019/12/21 21:40:00 espie Exp $ # from: @(#)Makefile 5.1.1.1 (Berkeley) 5/7/91 # Missing: connectives, words @@ -7,7 +7,7 @@ FILES= README propernames web2 web2a NOOBJ= noobj LINKS= ${BINDIR}/dict/web2 ${BINDIR}/dict/words -all clean cleandir depend tags: +all clean cleandir tags: realinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ diff --git a/share/misc/Makefile b/share/misc/Makefile index f8d6f926a06..dd268a05d6b 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2019/12/21 21:40:00 espie Exp $ # from: @(#)Makefile 5.13 (Berkeley) 5/7/91 FILES= airport birthtoken countrycodes \ @@ -11,7 +11,7 @@ FILES= airport birthtoken countrycodes \ SUBDIR= pcvtfonts .endif -all clean cleandir depend obj tags: _SUBDIRUSE +all clean cleandir obj tags: _SUBDIRUSE realinstall: cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ diff --git a/share/snmp/Makefile b/share/snmp/Makefile index 9c4f8b33b7a..ed86319e934 100644 --- a/share/snmp/Makefile +++ b/share/snmp/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2019/12/21 21:40:00 espie Exp $ FILES= OPENBSD-SNMPD-CONF.txt OPENBSD-BASE-MIB.txt FILES+= OPENBSD-MEM-MIB.txt OPENBSD-SENSORS-MIB.txt FILES+= OPENBSD-CARP-MIB.txt OPENBSD-PF-MIB.txt FILES+= OPENBSD-RELAYD-MIB.txt -all clean cleandir depend obj tags: _SUBDIRUSE +all clean cleandir obj tags: _SUBDIRUSE realinstall: ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 0444 \ diff --git a/share/tabset/Makefile b/share/tabset/Makefile index 560be07e7e1..c90b2354f99 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2019/12/21 21:40:01 espie Exp $ # from: @(#)Makefile 5.3 (Berkeley) 10/22/90 FILES= std stdcrt vt100 vt300 NOOBJ= noobj -all clean cleandir depend tags: +all clean cleandir tags: realinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ diff --git a/share/tmac/Makefile b/share/tmac/Makefile index 063ef8d0c84..c1ccde04973 100644 --- a/share/tmac/Makefile +++ b/share/tmac/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2019/12/21 21:40:01 espie Exp $ # from: @(#)Makefile 6.13 (Berkeley) 3/20/91 FILES= tmac.andoc @@ -7,7 +7,7 @@ NOOBJ= noobj SUBDIR= mdoc -all clean cleandir depend tags: +all clean cleandir tags: realinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ diff --git a/share/tmac/mdoc/Makefile b/share/tmac/mdoc/Makefile index b48fc3f5e77..afd1be421b9 100644 --- a/share/tmac/mdoc/Makefile +++ b/share/tmac/mdoc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2019/12/21 21:40:01 espie Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 MSRCS= doc doc-ditroff doc-common doc-nroff doc-syms @@ -8,7 +8,7 @@ LINKS= ${BINDIR}/doc ${BINDIR}/../tmac.doc STRIP_SED = ${.CURDIR}/../strip.sed NOOBJ= noobj -all clean cleandir depend tags: +all clean cleandir tags: beforeinstall: for i in ${MSRCS}; do \ diff --git a/usr.bin/infocmp/Makefile b/usr.bin/infocmp/Makefile index 919cd33d924..bda61701d75 100644 --- a/usr.bin/infocmp/Makefile +++ b/usr.bin/infocmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2017/06/16 10:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2019/12/21 21:40:01 espie Exp $ PROG= infocmp SRCS= infocmp.c dump_entry.c @@ -10,8 +10,6 @@ CFLAGS+= -I${CURSES} -I${TIC} -I${.CURDIR} -I. CLEANFILES+= termsort.c infocmp.1 .PATH: ${TIC} -beforedepend: termsort.c - dump_entry.o: termsort.c termsort.c: ${TIC}/MKtermsort.sh diff --git a/usr.bin/tic/Makefile b/usr.bin/tic/Makefile index e16d2461366..577f9acbe83 100644 --- a/usr.bin/tic/Makefile +++ b/usr.bin/tic/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2017/06/16 10:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2019/12/21 21:40:01 espie Exp $ PROG= tic SRCS= dump_entry.c tic.c @@ -15,8 +15,6 @@ CLEANFILES+= termsort.c captoinfo.1 COPTS+= -O0 .endif -beforedepend: termsort.c - dump_entry.o: termsort.c termsort.c: MKtermsort.sh diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile index 312f7528cb8..b7b86036f47 100644 --- a/usr.bin/tset/Makefile +++ b/usr.bin/tset/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2017/06/16 10:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2019/12/21 21:40:01 espie Exp $ PROG= tset SRCS= tset.c dump_entry.c @@ -11,8 +11,6 @@ CLEANFILES+= termsort.c .PATH: ${TIC} LINKS= ${BINDIR}/tset ${BINDIR}/reset -beforedepend: termsort.c - dump_entry.o: termsort.c termsort.c: ${TIC}/MKtermsort.sh diff --git a/usr.sbin/bind/Makefile.bsd-wrapper b/usr.sbin/bind/Makefile.bsd-wrapper index def9913606c..646d0100cbd 100644 --- a/usr.sbin/bind/Makefile.bsd-wrapper +++ b/usr.sbin/bind/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2019/12/16 17:16:12 sthen Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2019/12/21 21:40:01 espie Exp $ .include @@ -61,9 +61,6 @@ clean cleandir: -@if [ -e Makefile ]; then ${MAKE} distclean; fi rm -f ${CLEANFILES} -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/usr.sbin/nsd/Makefile.bsd-wrapper b/usr.sbin/nsd/Makefile.bsd-wrapper index 4e47a2a652e..215d0fae548 100644 --- a/usr.sbin/nsd/Makefile.bsd-wrapper +++ b/usr.sbin/nsd/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2017/06/12 18:49:34 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.16 2019/12/21 21:40:01 espie Exp $ .include @@ -73,9 +73,6 @@ clean cleandir: -@if [ -e Makefile ]; then ${MAKE} realclean; fi rm -f ${CLEANFILES} -depend: - # Nothing here so far... - tags: # Nothing here so far... diff --git a/usr.sbin/unbound/Makefile.bsd-wrapper b/usr.sbin/unbound/Makefile.bsd-wrapper index 7ffa5f2f323..5ed6c1e01a2 100644 --- a/usr.sbin/unbound/Makefile.bsd-wrapper +++ b/usr.sbin/unbound/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2019/03/31 14:24:16 florian Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2019/12/21 21:40:01 espie Exp $ .include @@ -89,9 +89,6 @@ clean cleandir: -@if [ -e Makefile ]; then ${MAKE} realclean; fi rm -f ${CLEANFILES} -depend: - # Nothing here so far... - tags: # Nothing here so far... -- cgit v1.2.3