remove makefile hacks that are no longer needed with t1 t2: working properly

okay krw@

4 files changed, 16 insertions, 42 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 934e5f9f0c3..7a2e4ce4275 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.62 2012/08/02 13:38:38 okan Exp $
+#	$OpenBSD: Makefile,v 1.63 2012/12/21 08:50:27 espie Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -269,7 +269,7 @@ MLINKS+= curs_inwstr.3 inwstr.3 curs_inwstr.3 innwstr.3 \
 
 GENERATED= init_keytry.h codes.c comp_captab.c expanded.c fallback.c \
 	keys.list lib_gen.c lib_keyname.c names.c unctrl.c make_hash make_keys
-CLEANFILES+= ${GENERATED} stamp_namebuild term.5 terminfo.5 curses.3 \
+CLEANFILES+= ${GENERATED} term.5 terminfo.5 curses.3 \
 	curs_addch.3 curs_attr.3 curs_getch.3 curs_inch.3 curs_mouse.3
 
 .if make(install)
@@ -323,14 +323,12 @@ lib_keyname.c: keys.list ${.CURDIR}/base/MKkeyname.awk
 	${AWK} -f ${.CURDIR}/base/MKkeyname.awk bigstrings=1 \
 		keys.list > ${.TARGET}
 
-names.c codes.c: stamp_namebuild
-
-stamp_namebuild: ${.CURDIR}/tinfo/MKnames.awk ${.CURDIR}/tinfo/MKcodes.awk
+names.c: ${.CURDIR}/tinfo/MKnames.awk
 	${AWK} -f ${.CURDIR}/tinfo/MKnames.awk \
 		${.CURDIR}/Caps > names.c
+codes.c: ${.CURDIR}/tinfo/MKcodes.awk
 	${AWK} -f ${.CURDIR}/tinfo/MKcodes.awk \
 		bigstrings=1 ${.CURDIR}/Caps > codes.c
-	touch $@
 
 unctrl.c: ${.CURDIR}/base/MKunctrl.awk
 	echo | ${AWK} -f ${.CURDIR}/base/MKunctrl.awk bigstrings=1 > ${.TARGET}
diff --git a/lib/libkeynote/Makefile b/lib/libkeynote/Makefile
index f9b467b07d9..1f1291028e2 100644
--- a/lib/libkeynote/Makefile
+++ b/lib/libkeynote/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2012/08/02 13:38:38 okan Exp $
+#	$OpenBSD: Makefile,v 1.19 2012/12/21 08:50:27 espie Exp $
 
 LIB=	keynote
 MAN=	keynote.3 keynote.4 keynote.5
@@ -24,14 +24,11 @@ HDRS=	keynote.h
 SRCS=	k.tab.c lex.kn.c environment.c parse_assertion.c signature.c auxil.c \
 	base64.c
 
-CLEANFILES+= k.tab.c lex.kn.c k.tab.h stamp_k
+CLEANFILES+= k.tab.c lex.kn.c k.tab.h
 
-stamp_k: keynote.y keynote.h signature.h
-	touch $@
+k.tab.c k.tab.h: keynote.y keynote.h signature.h
 	$(YACC.y) $(YACCFLAGS) ${.CURDIR}/keynote.y
 
-k.tab.c k.tab.h: stamp_k
-
 lex.kn.c: keynote.l keynote.y keynote.h assertion.h signature.h
 	$(LEX.l) $(LEXFLAGS) ${.CURDIR}/keynote.l
 
diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 59e6b51a0c1..f18a4543bce 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.82 2010/10/15 10:18:42 jsg Exp $
+#	$OpenBSD: Makefile,v 1.83 2012/12/21 08:50:27 espie Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -78,40 +78,22 @@ CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 LDADD+=		${LWRESLIB} -lkeynote -lcrypto -lm
 DPADD+=		${LWRESLIB} ${LIBKEYNOTE} ${LIBCRYPTO} ${LIBM}
 
-exchange_num.c exchange_num.h: stamp_exchange_num
-
-stamp_exchange_num: genconstants.sh exchange_num.cst
+exchange_num.c exchange_num.h: genconstants.sh exchange_num.cst
 	/bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/exchange_num
-	@touch $@
-
-ipsec_fld.c ipsec_fld.h: stamp_ipsec_fld
 
-stamp_ipsec_fld: genfields.sh ipsec_fld.fld
+ipsec_fld.c ipsec_fld.h: genfields.sh ipsec_fld.fld
 	/bin/sh ${.CURDIR}/genfields.sh ${.CURDIR}/ipsec_fld
-	@touch $@
-
-ipsec_num.c ipsec_num.h: stamp_ipsec_num
 
-stamp_ipsec_num: genconstants.sh ipsec_num.cst
+ipsec_num.c ipsec_num.h: genconstants.sh ipsec_num.cst
 	/bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/ipsec_num
-	@touch $@
 
-isakmp_fld.c isakmp_fld.h: stamp_isakmp_fld
-
-stamp_isakmp_fld: genfields.sh isakmp_fld.fld
+isakmp_fld.c isakmp_fld.h: genfields.sh isakmp_fld.fld
 	/bin/sh ${.CURDIR}/genfields.sh ${.CURDIR}/isakmp_fld
-	@touch $@
-
-isakmp_num.c isakmp_num.h: stamp_isakmp_num
 
-stamp_isakmp_num: genconstants.sh isakmp_num.cst
+isakmp_num.c isakmp_num.h: genconstants.sh isakmp_num.cst
 	/bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/isakmp_num
-	@touch $@
 
 ${PROG} beforedepend: ${GENERATED}
 
-CLEANFILES += stamp_exchange_num stamp_ipsec_fld \
-	stamp_ipsec_num stamp_isakmp_fld stamp_isakmp_num
-
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 54857d3010f..289b91de847 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,20 +1,17 @@
-#	$OpenBSD: Makefile,v 1.11 2010/08/25 19:21:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.12 2012/12/21 08:50:27 espie Exp $
 
 PROG=	awk
 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 stamp_tabs
+CLEANFILES+=proctab.c maketab ytab.c ytab.h
 CFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 HOSTCFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 
-stamp_tabs: awkgram.y
+ytab.c ytab.h: 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