5 files changed, 8 insertions, 16 deletions
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 75e0562a5f9..acef57584f3 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2017/07/04 08:39:57 espie Exp $
+#	$OpenBSD: Makefile,v 1.16 2017/07/09 14:04:50 espie Exp $
 
 # -DEXTENDED 
 # 	if you want the paste & spaste macros.
@@ -14,11 +14,4 @@ DPADD= ${LIBM} ${LIBUTIL}
 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c tokenizer.l parser.y
 MAN=	m4.1
 
-parser.c parser.h: parser.y
-	${YACC} -o parser.c -d ${.ALLSRC}
-
-tokenizer.o: parser.h
-
-CLEANFILES+=parser.c parser.h tokenizer.o
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 19b1dc630b4..b1f2ee3c9a5 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,11 +1,10 @@
-#	$OpenBSD: Makefile,v 1.19 2014/07/12 03:32:00 guenther Exp $
+#	$OpenBSD: Makefile,v 1.20 2017/07/09 14:04:50 espie Exp $
 
 
 PROG=	rdist
 CFLAGS+=-I. -I${.CURDIR}
 SRCS=	gram.y child.c client.c common.c distopt.c docmd.c expand.c \
 	isexec.c lookup.c message.c rdist.c
-CLEANFILES+=gram.c y.tab.h
 WARNINGS=yes
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/rdist/client.c b/usr.bin/rdist/client.c
index a4336e12f85..56a491e798d 100644
--- a/usr.bin/rdist/client.c
+++ b/usr.bin/rdist/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.35 2015/12/09 19:39:10 mmcc Exp $	*/
+/*	$OpenBSD: client.c,v 1.36 2017/07/09 14:04:50 espie Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #include "client.h"
-#include "y.tab.h"
+#include "gram.h"
 
 /*
  * Routines used in client mode to communicate with remove server.
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 0e92c7c3ea5..78823092d33 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: docmd.c,v 1.32 2015/01/20 09:00:16 guenther Exp $	*/
+/*	$OpenBSD: docmd.c,v 1.33 2017/07/09 14:04:50 espie Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #include "client.h"
-#include "y.tab.h"
+#include "gram.h"
 
 /*
  * Functions for rdist that do command (cmd) related activities.
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index fcdd61b00ed..ffa692b2f82 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdist.c,v 1.30 2015/02/08 23:40:34 deraadt Exp $	*/
+/*	$OpenBSD: rdist.c,v 1.31 2017/07/09 14:04:50 espie Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -38,7 +38,7 @@
 #include <unistd.h>
 
 #include "client.h"
-#include "y.tab.h"
+#include "gram.h"
 
 
 /*