remove misc. depend and yacc nits that no longer matter.

okay millert@

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 9b363dd..aeec559 100644 (file)
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.15 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.16 2017/07/10 21:30:37 espie Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -28,7 +28,6 @@ const.h: const.c
            sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
            sort >> $@
 
-.depend alloc.o: const.h error.h 
 BUILDFIRST = const.h error.h
 
 .include <bsd.prog.mk>

diff --git a/games/hack/Makefile b/games/hack/Makefile
index 8eddaab..45102fc 100644 (file)
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,8 +1,7 @@
-#      $OpenBSD: Makefile,v 1.15 2017/07/01 14:37:25 espie Exp $
+#      $OpenBSD: Makefile,v 1.16 2017/07/10 21:30:37 espie Exp $
 
 PROG=  hack
 CFLAGS+=-I.
-SRCS+= hack.onames.h
 SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
        hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \
        hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \

diff --git a/gnu/lib/libiberty/Makefile.bsd-wrapper b/gnu/lib/libiberty/Makefile.bsd-wrapper
index 91974da..bf354b4 100644 (file)
--- a/gnu/lib/libiberty/Makefile.bsd-wrapper
+++ b/gnu/lib/libiberty/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.17 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.18 2017/07/10 21:30:37 espie Exp $
 
 LIB=           iberty
 CPPFLAGS+=     -DHAVE_CONFIG_H -I$(.CURDIR)/src -I$(.CURDIR)/include -I$(.OBJDIR)
@@ -29,8 +29,6 @@ CLEANFILES+=  Makefile config.cache config.log stamp-h xhost-mkfrag \
                testsuite/Makefile libiberty.info
 
 
-depend:        needed-list
-
 BUILDFIRST = needed-list
 
 needed-list: config.status

diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 628a777..1634f51 100644 (file)
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.39.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.2 2010/05/06 20:58:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2017/07/10 21:30:37 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
 PROG=  cc1plus
-#SRCS= cfns.h
+
 SRCS+= main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
        decl.c decl2.c error.c except.c expr.c dump.c friend.c  init.c lex.c \
        mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \

diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 120f2d5..0771c07 100644 (file)
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.16 2017/06/23 11:54:22 jsg Exp $
+# $OpenBSD: Makefile,v 1.17 2017/07/10 21:30:37 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -510,7 +510,6 @@ GNTOOLS+=   genattr genattrtab genautomata gencodes gencheck genchecksum \
                genoutput genpeep genpreds genrecog
 
 all: ${GNTOOLS} ${GENSRCS} ${GENONLY}
-beforedepend: ${GENONLY}
 
 #-----------------------------------------------------------------------
 # Fixups.

diff --git a/gnu/usr.bin/cc/libobjc/Makefile b/gnu/usr.bin/cc/libobjc/Makefile
index c01ba34..a371648 100644 (file)
--- a/gnu/usr.bin/cc/libobjc/Makefile
+++ b/gnu/usr.bin/cc/libobjc/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.34.2.1 2009/08/03 08:13:06 kensmith Exp $
-# $OpenBSD: Makefile,v 1.6 2017/06/16 10:25:54 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2017/07/10 21:30:37 espie Exp $
 
 OBJCDIR=${.CURDIR}/../../../gcc/libobjc
 GCCDIR=        ${.CURDIR}/../../../gcc/gcc
@@ -50,7 +50,6 @@ includes: ${INCS}
                ${DESTDIR}/usr/include/objc
 .endif
 
-${OBJS}: ${GENHDRS}
 BUILDFIRST = ${GENHDRS}
 
 .include <bsd.lib.mk>

diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 3d689ef..a49b2b4 100644 (file)
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.26 2017/01/21 00:46:32 guenther Exp $
+#      $OpenBSD: Makefile,v 1.27 2017/07/10 21:30:37 espie Exp $
 
 OBJS=          crt0.o gcrt0.o
 OBJS+=         crtbegin.o crtend.o
@@ -88,7 +88,4 @@ realinstall:
        ${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
            ${DESTDIR}/usr/lib
 
-afterdepend: .depend
-       @sed -i 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o r\1.o:/' .depend
-
 .include <bsd.prog.mk>

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 4b6fdfb..cb714c5 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/06/16 10:25:54 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2017/07/10 21:30:37 espie Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -439,7 +439,6 @@ SRCS+= rc4_enc.c rc4_skey.c
 SRCS+= wp_block.c
 .endif
 
-all beforedepend: ${GENERATED}
 BUILDFIRST = ${GENERATED}
 
 .include <bsd.lib.mk>

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 0d5dd27..2b35d15 100644 (file)
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.71 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.72 2017/07/10 21:30:37 espie Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -98,10 +98,6 @@ GENERATED= init_keytry.h codes.c comp_captab.c expanded.c fallback.c \
 CLEANFILES+= ${GENERATED} term.5 terminfo.5 curses.3 \
        curs_addch.3 curs_attr.3 curs_getch.3 curs_inch.3 curs_mouse.3
 
-all: ${GENERATED}
-
-beforedepend: ${GENERATED}
-
 BUILDFIRST = ${GENERATED}
 
 includes:
@@ -171,9 +167,6 @@ afterinstall:
 
 .include <bsd.lib.mk>
 
-init_keytry.o init_keytry.so init_keytry.po init_keytry.ln: init_keytry.h
-lib_options.o lib_options.so lib_options.po lib_options.ln: init_keytry.h
-
 # must be at the end because bsd.lib.mk clears it
 .SUFFIXES: .3 .3tbl .5 .5tbl
 

diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 00f877d..31d53c0 100644 (file)
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.28 2017/07/03 18:19:55 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.29 2017/07/10 21:30:37 espie Exp $
 #      $NetBSD: Makefile,v 1.41 2010/02/03 15:34:43 roy Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
@@ -35,7 +35,7 @@ CLEANFILES+=  ${GENERATED}
 HOST_SH=       sh
 
 .PHONY: generated
-.depend generated: ${GENERATED}
+generated: ${GENERATED}
 BUILDFIRST = ${GENERATED}
 
 vi.h: vi.c makelist

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 7cdcdd2..61f1ddb 100644 (file)
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.87 2017/07/03 18:19:55 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.88 2017/07/10 21:30:37 espie Exp $
 #      $EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -82,7 +82,7 @@ isakmp_num.c isakmp_num.h: genconstants.sh isakmp_num.cst
        /bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/isakmp_num
 
 .PHONY: generated
-${PROG} beforedepend generated: ${GENERATED}
+generated: ${GENERATED}
 
 BUILDFIRST = ${GENERATED}
 

diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 6ca3c32..d9095d3 100644 (file)
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.42 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.43 2017/07/10 21:30:37 espie Exp $
 
 .if ${MACHINE} != "octeon"
 
@@ -7,9 +7,8 @@ SRCS=   display.c keyboard.c keysym.c map_parse.y map_scan.l \
        mouse.c util.c wsconsctl.c
 
 CPPFLAGS+=     -I${.CURDIR} -I.
-CLEANFILES+=   keysym.h y.tab.h
+CLEANFILES+=   keysym.h
 
-beforedepend: keysym.h
 keysym.o: keysym.h
 
 keysym.h: mkkeysym.sh ${DESTDIR}/usr/include/dev/wscons/wsksymdef.h

diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 8f2cc66..352d521 100644 (file)
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.15 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.16 2017/07/10 21:30:37 espie Exp $
 
 PROG=  awk
 SRCS=  ytab.c lex.c b.c main.c parse.c proctab.c tran.c lib.c run.c
@@ -9,9 +9,7 @@ CFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 HOSTCFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 
 ytab.c ytab.h: awkgram.y
-       ${YACC} -d ${.CURDIR}/awkgram.y
-       mv y.tab.c ytab.c
-       mv y.tab.h ytab.h
+       ${YACC} -o ytab.c -d ${.CURDIR}/awkgram.y
 
 BUILDFIRST = ytab.h
 

diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 78d6df5..301bd6a 100644 (file)
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2017/07/03 15:17:11 espie Exp $
+#      $OpenBSD: Makefile,v 1.4 2017/07/10 21:30:37 espie Exp $
 #      $NetBSD: Makefile,v 1.11 2003/08/01 17:04:04 lukem Exp $
 
 .include <bsd.own.mk>
@@ -8,10 +8,4 @@ SRCS=          yacc.y lex.l
 CPPFLAGS+=     -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc -I${.CURDIR}/../../lib/libc/include
 YHEADER=       1
 
-yacc.c yacc.h: yacc.y
-       ${YACC} -d ${.ALLSRC} && mv y.tab.c yacc.c && mv y.tab.h yacc.h
-
-lex.o: yacc.h
-
-CLEANFILES+= yacc.c yacc.h
 .include <bsd.prog.mk>

diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 2106626..3b14de1 100644 (file)
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.7 2017/07/10 21:30:37 espie Exp $
 
 PROG = rpc.lockd
 SRCS = nlm_prot_svc.c lockd.c lockd_lock.c procs.c
@@ -14,7 +14,7 @@ CLEANFILES= nlm_prot_svc.c nlm_prot.h
 RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
 RPCGEN= rpcgen -L -C
 
-nlm_prot_svc.c: ${RPCSRC} nlm_prot.h
+nlm_prot_svc.c: ${RPCSRC}
        ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}
 
 nlm_prot.h: ${RPCSRC}

diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index dbeb428..8158cdd 100644 (file)
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.3 2017/07/10 21:30:37 espie Exp $
 
 PROG=  rpc.statd
 SRCS=  procs.c sm_inter_svc.c statd.c
@@ -14,7 +14,7 @@ CLEANFILES=   sm_inter_svc.c sm_inter.h
 RPCSRC=        ${DESTDIR}/usr/include/rpcsvc/sm_inter.x
 RPCGEN=        rpcgen -L -C
 
-sm_inter_svc.c: ${RPCSRC} sm_inter.h
+sm_inter_svc.c: ${RPCSRC}
        ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}
 
 sm_inter.h: ${RPCSRC}

diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile
index dbbd288..8bdee35 100644 (file)
--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.13 2017/06/16 10:25:54 espie Exp $
+#      $OpenBSD: Makefile,v 1.14 2017/07/10 21:30:37 espie Exp $
 
 PROG=  ypserv
 MAN=   ypserv.acl.5 securenet.5 ypserv.8
@@ -19,7 +19,6 @@ CFLAGS+=-DDAEMON -DOPTDB -I${.CURDIR}/../common -I.
 #CFLAGS=-DDAEMON -I${.CURDIR}/../common  -DDEBUG -g
 
 all:   ypserv
-beforedepend:  ${HDRS}
 ypv1.c: ypv1.h
 
 BUILDFIRST =   ${HDRS}