fix yacc/lex parallel file generation

3 files changed, 23 insertions, 7 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 2e31db254d7..bad3782baa2 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.56 2007/10/26 19:45:22 espie Exp $
+#	$OpenBSD: Makefile,v 1.57 2007/11/24 15:43:08 espie Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -189,7 +189,7 @@ MLINKS+= termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
 
 GENERATED= init_keytry.h nomacros.h codes.c comp_captab.c expanded.c \
 	fallback.c lib_gen.c lib_keyname.c names.c unctrl.c make_hash make_keys
-CLEANFILES+= ${GENERATED}
+CLEANFILES+= ${GENERATED} stamp_namebuild
 
 .if make(install)
 SUBDIR+= doc
@@ -235,11 +235,14 @@ comp_captab.c: make_hash ${.CURDIR}/ncurses_cfg.h ${.CURDIR}/tic.h ${.CURDIR}/te
 lib_keyname.c: ${.CURDIR}/ncurses_cfg.h ${.CURDIR}/curses.h ${.CURDIR}/term.h  ${.CURDIR}/tinfo/keys.list ${.CURDIR}/base/MKkeyname.awk
 	${AWK} -f ${.CURDIR}/base/MKkeyname.awk ${.CURDIR}/tinfo/keys.list > ${.TARGET}
 
-names.c codes.c: ${.CURDIR}/tinfo/MKnames.awk
+names.c codes.c: stamp_namebuild
+
+stamp_namebuild: ${.CURDIR}/tinfo/MKnames.awk
 	${AWK} -f ${.CURDIR}/tinfo/MKnames.awk ${.CURDIR}/Caps
 	cat namehdr boolnames boolfnames numnames numfnames strnames strfnames nameftr > names.c
 	cat namehdr boolcodes numcodes strcodes codeftr > codes.c
 	-rm -f namehdr nameftr codeftr boolnames boolfnames boolcodes numnames numfnames numcodes strnames strfnames strcodes
+	touch $@
 
 unctrl.c: ${.CURDIR}/base/MKunctrl.awk
 	echo | ${AWK} -f ${.CURDIR}/base/MKunctrl.awk > ${.TARGET}
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 89982e96190..49361184f74 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.8 2007/03/18 15:37:06 mickey Exp $
+#	$OpenBSD: Makefile,v 1.9 2007/11/24 15:43:08 espie Exp $
 
 PROG=	awk
 LINKS=	${BINDIR}/awk ${BINDIR}/nawk
 SRCS=	ytab.c lex.c b.c main.c parse.c proctab.c tran.c lib.c run.c
 LDADD=	-lm
 DPADD=	${LIBM}
-CLEANFILES+=proctab.c maketab ytab.c ytab.h
+CLEANFILES+=proctab.c maketab ytab.c ytab.h stamp_tabs
 CFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 HOSTCFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 MLINKS=	awk.1 nawk.1
@@ -15,10 +15,13 @@ MLINKS=	awk.1 nawk.1
 SUBDIR+= USD.doc
 .endif
 
-ytab.c ytab.h: awkgram.y
+stamp_tabs: awkgram.y
 	${YACC} -d ${.CURDIR}/awkgram.y
 	mv y.tab.c ytab.c
 	mv y.tab.h ytab.h
+	touch $@
+
+ytab.c ytab.h: stamp_tabs
 
 proctab.c: maketab
 	./maketab >proctab.c
diff --git a/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl b/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
index 6a04f2066ec..92aa0439c05 100644
--- a/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
+++ b/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
@@ -154,6 +154,7 @@ clean:
 realclean: clean
 	rm -f ssl_expr_parse.c ssl_expr_parse.h
 	rm -f ssl_expr_scan.c
+	rm -f stamp_parse
 
 distclean: clean
 	-rm -f Makefile
@@ -167,7 +168,16 @@ ssl_expr_scan.c: ssl_expr_scan.l ssl_expr_parse.h
 	flex -Pssl_expr_yy -s -B ssl_expr_scan.l
 	sed -e '/$$Header:/d' <lex.ssl_expr_yy.c >ssl_expr_scan.c && rm -f lex.ssl_expr_yy.c
 
-ssl_expr_parse.c ssl_expr_parse.h: ssl_expr_parse.y
+stamp_parse: ssl_expr_parse.y
+	yacc -d ssl_expr_parse.y
+	touch $@
+	sed -e 's;yy;ssl_expr_yy;g' \
+	    -e '/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d' \
+	    <y.tab.c >ssl_expr_parse.c && rm -f y.tab.c
+	sed -e 's;yy;ssl_expr_yy;g' \
+	    <y.tab.h >ssl_expr_parse.h && rm -f y.tab.h
+
+ssl_expr_parse.c ssl_expr_parse.h: stamp_parse
 	yacc -d ssl_expr_parse.y
 	sed -e 's;yy;ssl_expr_yy;g' \
 	    -e '/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d' \