upas/*: cleanup mkfiles (thanks amavect)

Changeset 50ad211fb12f broke the libcommon rule in
mkupas. Deleting the 'mk clean' in the recipe fixes
this.

Cleanup includes deleting UPDATE vars from all mkfiles,
reorganization of vars in TARG,LIB,OFILE,HFILE order,
and deletion of extra vars used for UPDATE.

25 files changed, 97 insertions, 298 deletions

diff --git a/sys/src/cmd/upas/Mail/mkfile b/sys/src/cmd/upas/Mail/mkfile
index 260281de8..0055f3dee 100644
--- a/sys/src/cmd/upas/Mail/mkfile
+++ b/sys/src/cmd/upas/Mail/mkfile
@@ -3,24 +3,18 @@
 
 TARG=Mail
 OFILES=\
-		html.$O\
-		mail.$O\
-		mesg.$O\
-		reply.$O\
-		util.$O\
-		win.$O
+	html.$O\
+	mail.$O\
+	mesg.$O\
+	reply.$O\
+	util.$O\
+	win.$O\
 
 HFILES=dat.h
-LIB=
 
 # BIN=/acme/bin/$objtype
 BIN=$ABIN
 
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-
 </sys/src/cmd/mkone
 
 $O.out: $OFILES
@@ -29,4 +23,3 @@ $O.out: $OFILES
 syms:V:
 	$CC -a mail.c	>syms
 	$CC -aa mesg.c reply.c util.c win.c 	>>syms
-
diff --git a/sys/src/cmd/upas/alias/mkfile b/sys/src/cmd/upas/alias/mkfile
index 9eb3f37f0..900fa12cd 100644
--- a/sys/src/cmd/upas/alias/mkfile
+++ b/sys/src/cmd/upas/alias/mkfile
@@ -2,19 +2,11 @@
 <../mkupas
 
 TARG=aliasmail
-
-OFILES=aliasmail.$O\
-
-LIB=../common/libcommon.a$O\
-
-HFILES=../common/common.h\
-	 ../common/sys.h\
-
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
+LIB=../common/libcommon.a$O
+OFILES=aliasmail.$O
+HFILES=\
+	../common/common.h\
+	../common/sys.h\
 
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common
diff --git a/sys/src/cmd/upas/bayes/mkfile b/sys/src/cmd/upas/bayes/mkfile
index c0c546e73..bc63acd27 100644
--- a/sys/src/cmd/upas/bayes/mkfile
+++ b/sys/src/cmd/upas/bayes/mkfile
@@ -1,11 +1,8 @@
 </$objtype/mkfile
+<../mkupas
 
 TARG=addhash bayes msgtok
-HFILES=
-OFILES=
-LIB=
 
-BIN=/$objtype/bin/upas
 </sys/src/cmd/mkmany
 
 # msg tokenizer
@@ -29,5 +26,3 @@ $O.msgclass: hash.$O msgdbx.$O
 $O.addhash: hash.$O 
 
 $O.bayes: hash.$O
-
-
diff --git a/sys/src/cmd/upas/binscripts/mkfile b/sys/src/cmd/upas/binscripts/mkfile
index ea125f725..1edc72051 100644
--- a/sys/src/cmd/upas/binscripts/mkfile
+++ b/sys/src/cmd/upas/binscripts/mkfile
@@ -1,7 +1,8 @@
 </$objtype/mkfile
 <../mkupas
 
-RCFILES=isspam\
+RCFILES=\
+	isspam\
 	msgcat\
 	spam\
 	tfmt\
@@ -24,11 +25,5 @@ clean:Q:
 nuke:V:
 	rm $BIN/^($RCFILES)
 
-UPDATE=$RCFILES
-
-update:V:
-	update $UPDATEFLAGS $UPDATE
-
 $BIN/%: %.rc
 	cp $stem.rc $BIN/$stem
-
diff --git a/sys/src/cmd/upas/binscripts/mkfile.rc b/sys/src/cmd/upas/binscripts/mkfile.rc
index c3593840b..1280b0aab 100644
--- a/sys/src/cmd/upas/binscripts/mkfile.rc
+++ b/sys/src/cmd/upas/binscripts/mkfile.rc
@@ -1,5 +1,5 @@
 
-RCFILES=mail.rc\
+RCFILES=mail.rc
 
 all:Q:
 	;
@@ -20,19 +20,3 @@ clean:Q:
 	;
 nuke:V:
 	rm /rc/bin/mail
-
-UPDATE=\
-	gone.fishing\
-	gone.msg\
-	mail.rc\
-	mail.sh\
-	makefile\
-	mkfile\
-	namefiles\
-	omail.rc\
-	qmail\
-	remotemail\
-	rewrite\
-
-update:V:
-	update $UPDATEFLAGS $UPDATE
diff --git a/sys/src/cmd/upas/common/mkfile b/sys/src/cmd/upas/common/mkfile
index 4d8de207d..f32bcf911 100644
--- a/sys/src/cmd/upas/common/mkfile
+++ b/sys/src/cmd/upas/common/mkfile
@@ -11,13 +11,10 @@ OFILES=\
 	libsys.$O\
 	process.$O\
 
-HFILES=common.h\
+HFILES=\
+	common.h\
 	sys.h\
 
-CLEANFILES=$LIB
+CLEANFILES=libcommon.a[$OS]
 
 </sys/src/cmd/mklib
-
-nuke:V:
-	mk clean
-	rm -f libcommon.a[$OS]
diff --git a/sys/src/cmd/upas/filterkit/mkfile b/sys/src/cmd/upas/filterkit/mkfile
index 18415495f..8584374f7 100644
--- a/sys/src/cmd/upas/filterkit/mkfile
+++ b/sys/src/cmd/upas/filterkit/mkfile
@@ -7,16 +7,8 @@ TARG=\
 	mbappend\
 	token\
 
-LIB=../common/libcommon.a$O\
-
+LIB=../common/libcommon.a$O
 OFILES=readaddrs.$O
-UPDATE=\
-	mkfile\
-	${TARG:%=%.c}\
-	pipeto.sample\
-	pipefrom.sample\
-	pipeto.sample-hold\
 
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
-
diff --git a/sys/src/cmd/upas/fs/mkfile b/sys/src/cmd/upas/fs/mkfile
index 024c2f17b..095991cef 100644
--- a/sys/src/cmd/upas/fs/mkfile
+++ b/sys/src/cmd/upas/fs/mkfile
@@ -1,7 +1,8 @@
 </$objtype/mkfile
+<../mkupas
 
 TARG=fs
-
+LIB=../common/libcommon.a$O
 OFILES=\
 	cache.$O\
 	fs.$O\
@@ -18,21 +19,12 @@ OFILES=\
 	strtotm.$O\
 	tls.$O\
 
-LIB=../common/libcommon.a$O\
-
-HFILES= ../common/common.h\
-	dat.h
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${TARG:%=%.c}\
-	${OFILES:%.$O=%.c}\
+HFILES=\
+	../common/common.h\
+	dat.h\
 
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS  -I../common
 
-<../mkupas
-
 acid:V:
 	$CC -a $CFLAGS fs.c>a$O
diff --git a/sys/src/cmd/upas/imap4d/mkfile b/sys/src/cmd/upas/imap4d/mkfile
index c751963fa..4ae435944 100644
--- a/sys/src/cmd/upas/imap4d/mkfile
+++ b/sys/src/cmd/upas/imap4d/mkfile
@@ -1,4 +1,7 @@
 </$objtype/mkfile
+<../mkupas
+
+TARG=imap4d
 
 OFILES=\
 	auth.$O\
@@ -23,16 +26,8 @@ OFILES=\
 	store.$O\
 	utils.$O\
 
-HFILES=imap4d.h\
+HFILES=\
+	imap4d.h\
 	fns.h\
 
-TARG=imap4d
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-
 </sys/src/cmd/mkone
-
-<../mkupas
diff --git a/sys/src/cmd/upas/marshal/mkfile b/sys/src/cmd/upas/marshal/mkfile
index acbd8fe1f..a2e517cb0 100644
--- a/sys/src/cmd/upas/marshal/mkfile
+++ b/sys/src/cmd/upas/marshal/mkfile
@@ -2,18 +2,10 @@
 <../mkupas
 
 TARG=marshal
+LIB=../common/libcommon.a$O
+OFILES=marshal.$O
+HFILES=../common/common.h
 
-LIB=../common/libcommon.a$O\
-
-HFILES=	../common/common.h\
-
-OFILES= marshal.$O
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common
 
diff --git a/sys/src/cmd/upas/mkfile b/sys/src/cmd/upas/mkfile
index 4b64ae896..8f78351ad 100644
--- a/sys/src/cmd/upas/mkfile
+++ b/sys/src/cmd/upas/mkfile
@@ -24,46 +24,10 @@ PROGS=\
 #libs must be made first
 DIRS=$LIBS $PROGS
 
-UPDATE=\
-	mkfile\
-	/sys/man/1/mail\
-
-all:V:
-	for (i in $DIRS) @{
-		cd $i
-		mk all
-	}
-
-clean:V:
-	for (i in $DIRS) @{
-		cd $i
-		mk clean
-	}
-
-nuke:V:
-	for (i in $LIBS) @{
-		cd $i
-		mk nuke
-	}
-	for (i in $PROGS) @{
-		cd $i
-		mk clean
-	}
-
-install:V:
+all install installall clean nuke:V:
 	for (i in $DIRS) @{
 		cd $i
-		mk install
-	}
-
-installall:V:
-	for (i in $DIRS) @{
-		cd $i
-		mk installall
-	}
-	for (i in $DIRS) @{
-		cd $i
-		mk clean
+		mk $target
 	}
 
 safeinstallall:V:
@@ -75,15 +39,3 @@ safeinstallall:V:
 		cd $i
 		mk safeinstallall
 	}
-	for (i in $DIRS) @{
-		cd $i
-		mk clean
-	}
-
-update:V:
-	update $UPDATEFLAGS $UPDATE
-	for (i in $DIRS) @{
-		cd $i
-		echo '>>>>>>>>>>' `{pwd} '<<<<<<<<<<<'
-		mk $MKFLAGS 'UPDATEFLAGS='$"UPDATEFLAGS update
-	}
diff --git a/sys/src/cmd/upas/mkupas b/sys/src/cmd/upas/mkupas
index 66790ac44..622d700cc 100644
--- a/sys/src/cmd/upas/mkupas
+++ b/sys/src/cmd/upas/mkupas
@@ -2,4 +2,4 @@ BIN=/$objtype/bin/upas
 ABIN=/acme/bin/$objtype
 
 ../common/libcommon.a$O:
-	cd ../common; mk; mk clean
+	cd ../common; mk
diff --git a/sys/src/cmd/upas/ml/dat.h b/sys/src/cmd/upas/ml/dat.h
index 3527af508..5d23bae8f 100644
--- a/sys/src/cmd/upas/ml/dat.h
+++ b/sys/src/cmd/upas/ml/dat.h
@@ -1,6 +1,6 @@
 
 #include "../smtp/smtp.h"
-#include "../smtp/y.tab.h"
+#include "../smtp/rfc822.tab.h"
 
 typedef struct Addr Addr;
 struct Addr
diff --git a/sys/src/cmd/upas/ml/mkfile b/sys/src/cmd/upas/ml/mkfile
index 7a6350e16..c87953545 100644
--- a/sys/src/cmd/upas/ml/mkfile
+++ b/sys/src/cmd/upas/ml/mkfile
@@ -1,30 +1,20 @@
 </$objtype/mkfile
 <../mkupas
 
-TARG=ml\
+TARG=\
+	ml\
 	mlowner\
 	mlmgr\
 
-OFILES=\
-	common.$O\
+LIB=../common/libcommon.a$O
 
-LIB=../common/libcommon.a$O\
+OFILES=common.$O
 
-UHFILES= ../common/common.h\
+HFILES=\
+	../common/common.h\
 	../common/sys.h\
 	dat.h\
-
-HFILES=$UHFILES\
-	../smtp/y.tab.h\
-
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
-	mkfile\
-	$UHFILES\
-	${TARG:%=%.c}\
-	${OFILES:%.$O=%.c}\
-	../smtp/rfc822.y\
+	../smtp/rfc822.tab.h\
 
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
@@ -32,5 +22,5 @@ CFLAGS=$CFLAGS -I../common
 $O.ml: ../smtp/rfc822.tab.$O
 $O.mlowner: ../smtp/rfc822.tab.$O
 
-../smtp/y.tab.h ../smtp/rfc822.tab.$O:
+../smtp/rfc822.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y
 	cd ../smtp && mk rfc822.tab.$O
diff --git a/sys/src/cmd/upas/ned/mkfile b/sys/src/cmd/upas/ned/mkfile
index 9df4a2adf..917108130 100644
--- a/sys/src/cmd/upas/ned/mkfile
+++ b/sys/src/cmd/upas/ned/mkfile
@@ -1,19 +1,10 @@
 </$objtype/mkfile
+<../mkupas
 
 TARG=nedmail
-
-LIB=../common/libcommon.a$O\
-
-HFILES=	../common/common.h\
-
+LIB=../common/libcommon.a$O
 OFILES=nedmail.$O
-
-UPDATE=\
-	mkfile\
-	${OFILES:%.$O=%.c}\
-	$HFILES\
+HFILES=../common/common.h
 
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common
-
-<../mkupas
diff --git a/sys/src/cmd/upas/pop3/mkfile b/sys/src/cmd/upas/pop3/mkfile
index 7b0348a7a..ee96f9703 100644
--- a/sys/src/cmd/upas/pop3/mkfile
+++ b/sys/src/cmd/upas/pop3/mkfile
@@ -2,15 +2,8 @@
 <../mkupas
 
 TARG=pop3
-
-OFILES=pop3.$O
-
 LIB=../common/libcommon.a$O
-
-UPDATE=\
-	mkfile\
-	${OFILES:%.$O=%.c}\
+OFILES=pop3.$O
 
 </sys/src/cmd/mkone
-
 CFLAGS=$CFLAGS -I../common
diff --git a/sys/src/cmd/upas/q/mkfile b/sys/src/cmd/upas/q/mkfile
index f58d82791..45b6afa2e 100644
--- a/sys/src/cmd/upas/q/mkfile
+++ b/sys/src/cmd/upas/q/mkfile
@@ -1,21 +1,15 @@
 </$objtype/mkfile
 <../mkupas
 
-TARG = qer\
+TARG=\
+	qer\
 	runq\
 
+LIB=../common/libcommon.a$O
 OFILES=
-
-HFILES=../common/common.h\
+HFILES=\
+	../common/common.h\
 	../common/sys.h\
 
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	${TARG:%=%.c}\
-
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
diff --git a/sys/src/cmd/upas/qfrom/mkfile b/sys/src/cmd/upas/qfrom/mkfile
index 5bee6c9ee..33a6006c6 100644
--- a/sys/src/cmd/upas/qfrom/mkfile
+++ b/sys/src/cmd/upas/qfrom/mkfile
@@ -1,13 +1,7 @@
 </$objtype/mkfile
+<../mkupas
 
 TARG=qfrom
-OFILES=qfrom.$O\
-
-BIN=/$objtype/bin/upas
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
+OFILES=qfrom.$O
 
 </sys/src/cmd/mkone
diff --git a/sys/src/cmd/upas/scanmail/mkfile b/sys/src/cmd/upas/scanmail/mkfile
index edecf499e..7223794cf 100644
--- a/sys/src/cmd/upas/scanmail/mkfile
+++ b/sys/src/cmd/upas/scanmail/mkfile
@@ -1,25 +1,20 @@
 </$objtype/mkfile
+<../mkupas
 
-TARG=scanmail\
+TARG=\
+	scanmail\
 	testscan
 
-OFILES=	common.$O
-
-HFILES=	spam.h\
-	../common/sys.h\
+LIB=../common/libcommon.a$O
 
-LIB=	../common/libcommon.a$O\
+OFILES=common.$O
 
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	${TARG:%=%.c}\
+HFILES=\
+	spam.h\
+	../common/sys.h\
 
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
 
-<../mkupas
-
-scanmail.$O:	scanmail.c
+scanmail.$O: scanmail.c
 	$CC $CFLAGS scanmail.c
diff --git a/sys/src/cmd/upas/send/message.c b/sys/src/cmd/upas/send/message.c
index 403201cdc..fbf90ba3f 100644
--- a/sys/src/cmd/upas/send/message.c
+++ b/sys/src/cmd/upas/send/message.c
@@ -2,7 +2,7 @@
 #include "send.h"
 #include <regexp.h>
 #include "../smtp/smtp.h"
-#include "../smtp/y.tab.h"
+#include "../smtp/rfc822.tab.h"
 
 enum{
 	VMLIMIT	= 64*1024,
diff --git a/sys/src/cmd/upas/send/mkfile b/sys/src/cmd/upas/send/mkfile
index 549d234f0..699374dd8 100644
--- a/sys/src/cmd/upas/send/mkfile
+++ b/sys/src/cmd/upas/send/mkfile
@@ -1,16 +1,17 @@
 </$objtype/mkfile
 <../mkupas
 
-TARG=send\
-	filter
+TARG=\
+	send\
+	filter\
 
-UOFILES=message.$O\
+LIB=../common/libcommon.a$O
+
+OFILES=\
+	message.$O\
 	dest.$O\
 	log.$O\
 	skipequiv.$O\
-
-OFILES=\
-	$UOFILES\
 	../smtp/rfc822.tab.$O\
 
 SOBJ=\
@@ -23,23 +24,13 @@ SOBJ=\
 	rewrite.$O\
 	translate.$O\
 
-FOBJ=\
-	cat_mail.$O\
-
+FOBJ=cat_mail.$O
 
-HFILES=send.h\
+HFILES=\
+	send.h\
 	../common/common.h\
 	../common/sys.h\
 
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${UOFILES:%.$O=%.c}\
-	${SOBJ:%.$O=%.c}\
-	${TARG:%=%.c}\
-
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
 
@@ -48,7 +39,7 @@ $O.send: $SOBJ $OFILES
 
 $O.filter: $FOBJ
 
-message.$O:	../smtp/y.tab.h
+message.$O: ../smtp/rfc822.tab.h
 
-../smtp/y.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y
+../smtp/rfc822.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y
 	cd ../smtp && mk rfc822.tab.$O
diff --git a/sys/src/cmd/upas/smtp/mkfile b/sys/src/cmd/upas/smtp/mkfile
index 538e99083..922b56137 100644
--- a/sys/src/cmd/upas/smtp/mkfile
+++ b/sys/src/cmd/upas/smtp/mkfile
@@ -1,30 +1,22 @@
 </$objtype/mkfile
+<../mkupas
 
-TARG = smtpd\
+TARG=\
+	smtpd\
 	smtp\
 
-TEST=\
-	parsetest
-
+LIB=../common/libcommon.a$O
 OFILES=
-
-LIB=../common/libcommon.a$O\
-
-HFILES=../common/common.h\
+HFILES=\
+	../common/common.h\
 	../common/sys.h\
 	smtpd.h\
 	smtp.h\
+	rfc822.tab.h\
+
+TEST=parsetest
 
-UPDATE=\
-	greylist.c\
-	mkfile\
-	mxdial.c\
-	rfc822.y\
-	smtpd.y\
-	spam.c\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
-	${TARG:%=%.c}\
+CLEANFILES=*.tab.?
 
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common
@@ -35,24 +27,16 @@ $O.smtpd:\
 	rfc822.tab.$O\
 	greylist.$O\
 
-$O.smtp:	rfc822.tab.$O mxdial.$O
+$O.smtp: rfc822.tab.$O mxdial.$O
 
 smtpd.tab.c: smtpd.y
 	yacc -o xxx smtpd.y
 	sed 's/yy/zz/g' < xxx > $target
 	rm xxx
 
-rfc822.tab.c: rfc822.y
-	yacc -d -o $target rfc822.y
+rfc822.tab.c rfc822.tab.h:D: rfc822.y
+	yacc -d -s rfc822 rfc822.y
 
 $O.parsetest: rfc822.tab.$O
 
 parsetest.$O: rfc822.tab.$O
-
-clean:V:
-	rm -f *.[$OS] [$OS].^($TARG $TEST) smtpd.tab.c rfc822.tab.c y.tab.? y.debug $TARG
-
-../common/libcommon.a$O:
-	cd ../common && mk
-
-<../mkupas
diff --git a/sys/src/cmd/upas/smtp/smtpd.c b/sys/src/cmd/upas/smtp/smtpd.c
index 0c974a835..907302876 100644
--- a/sys/src/cmd/upas/smtp/smtpd.c
+++ b/sys/src/cmd/upas/smtp/smtpd.c
@@ -7,7 +7,7 @@
 #include <mp.h>
 #include <libsec.h>
 #include <auth.h>
-#include "../smtp/y.tab.h"
+#include "rfc822.tab.h"
 
 char	*me;
 char	*him="";
diff --git a/sys/src/cmd/upas/unesc/mkfile b/sys/src/cmd/upas/unesc/mkfile
index e02edc484..c5be446cf 100644
--- a/sys/src/cmd/upas/unesc/mkfile
+++ b/sys/src/cmd/upas/unesc/mkfile
@@ -2,11 +2,6 @@
 <../mkupas
 
 TARG=unesc
-OFILES=unesc.$O\
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
+OFILES=unesc.$O
 
 </sys/src/cmd/mkone
diff --git a/sys/src/cmd/upas/vf/mkfile b/sys/src/cmd/upas/vf/mkfile
index 3a7c1c1de..b60bebad7 100644
--- a/sys/src/cmd/upas/vf/mkfile
+++ b/sys/src/cmd/upas/vf/mkfile
@@ -2,18 +2,11 @@
 <../mkupas
 
 TARG=vf
-
-OFILES=vf.$O\
-
-LIB=../common/libcommon.a$O\
-
-HFILES=../common/common.h\
-	 ../common/sys.h\
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${OFILES:%.$O=%.c}\
+LIB=../common/libcommon.a$O
+OFILES=vf.$O
+HFILES=\
+	../common/common.h\
+	../common/sys.h\
 
 </sys/src/cmd/mkone
 CFLAGS=$CFLAGS -I../common