xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

upas/*: fix mkfile issues (thanks amavect)

Browse source 
Fixes 3 issues in our upas mkfiles:
- mk/mkfile and send/mkfile were rebuilding
  only the rfc822.tab.$O, even though the
  header also needed to be rebuilt.
- CLEANFILES had a pattern that  would not
  get expanded.
- Third, ../upas/mkfile was being included
  in the wrong place and making the wrong
  rule default.
This commit is contained in:
Ori Bernstein 2020-11-22 11:36:23 -08:00
parent a041c90431
commit bd6747ccd0
19 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/upas/Mail/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=Mail TARG=Mail
OFILES=\ OFILES=\
@ -16,6 +15,7 @@ HFILES=dat.h
BIN=$ABIN BIN=$ABIN
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
$O.out: $OFILES $O.out: $OFILES
$LD -o $target $LDFLAGS $OFILES $LD -o $target $LDFLAGS $OFILES

2
sys/src/cmd/upas/alias/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=aliasmail TARG=aliasmail
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
@ -9,4 +8,5 @@ HFILES=\
../common/sys.h\ ../common/sys.h\
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

2
sys/src/cmd/upas/bayes/mkfile
View file

@ -1,9 +1,9 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=addhash bayes msgtok TARG=addhash bayes msgtok
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
# msg tokenizer # msg tokenizer
$O.regen: regcomp.$O dfa.$O $O.regen: regcomp.$O dfa.$O

3
sys/src/cmd/upas/binscripts/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
RCFILES=\ RCFILES=\
isspam\ isspam\
@ -27,3 +26,5 @@ nuke:V:
$BIN/%: %.rc $BIN/%: %.rc
cp $stem.rc $BIN/$stem cp $stem.rc $BIN/$stem
<../mkupas

2
sys/src/cmd/upas/filterkit/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
deliver\ deliver\
@ -11,4 +10,5 @@ LIB=../common/libcommon.a$O
OFILES=readaddrs.$O OFILES=readaddrs.$O
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

2
sys/src/cmd/upas/fs/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=fs TARG=fs
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
@ -24,6 +23,7 @@ HFILES=\
dat.h\ dat.h\
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common
acid:V: acid:V:

2
sys/src/cmd/upas/imap4d/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=imap4d TARG=imap4d
@ -31,3 +30,4 @@ HFILES=\
fns.h\ fns.h\
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas

2
sys/src/cmd/upas/marshal/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=marshal TARG=marshal
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
@ -7,5 +6,6 @@ OFILES=marshal.$O
HFILES=../common/common.h HFILES=../common/common.h
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

4
sys/src/cmd/upas/ml/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
ml\ ml\
@ -17,10 +16,11 @@ HFILES=\
../smtp/rfc822.tab.h\ ../smtp/rfc822.tab.h\
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common
$O.ml: ../smtp/rfc822.tab.$O $O.ml: ../smtp/rfc822.tab.$O
$O.mlowner: ../smtp/rfc822.tab.$O $O.mlowner: ../smtp/rfc822.tab.$O
../smtp/rfc822.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 cd ../smtp && mk rfc822.tab.h rfc822.tab.$O

2
sys/src/cmd/upas/ned/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=nedmail TARG=nedmail
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
@ -7,4 +6,5 @@ OFILES=nedmail.$O
HFILES=../common/common.h HFILES=../common/common.h
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

2
sys/src/cmd/upas/pop3/mkfile
View file

@ -1,9 +1,9 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=pop3 TARG=pop3
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
OFILES=pop3.$O OFILES=pop3.$O
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

2
sys/src/cmd/upas/q/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
qer\ qer\
@ -12,4 +11,5 @@ HFILES=\
../common/sys.h\ ../common/sys.h\
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common

2
sys/src/cmd/upas/qfrom/mkfile
View file

@ -1,7 +1,7 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=qfrom TARG=qfrom
OFILES=qfrom.$O OFILES=qfrom.$O
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas

2
sys/src/cmd/upas/scanmail/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
scanmail\ scanmail\
@ -14,6 +13,7 @@ HFILES=\
../common/sys.h\ ../common/sys.h\
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common
scanmail.$O: scanmail.c scanmail.$O: scanmail.c

4
sys/src/cmd/upas/send/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
send\ send\
@ -32,6 +31,7 @@ HFILES=\
../common/sys.h\ ../common/sys.h\
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common
$O.send: $SOBJ $OFILES $O.send: $SOBJ $OFILES
@ -42,4 +42,4 @@ $O.filter: $FOBJ
message.$O: ../smtp/rfc822.tab.h message.$O: ../smtp/rfc822.tab.h
../smtp/rfc822.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 cd ../smtp && mk rfc822.tab.h rfc822.tab.$O

4
sys/src/cmd/upas/smtp/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=\ TARG=\
smtpd\ smtpd\
@ -16,9 +15,10 @@ HFILES=\
TEST=parsetest TEST=parsetest
CLEANFILES=*.tab.? CLEANFILES=rfc822.tab.h rfc822.tab.c smtpd.tab.c
</sys/src/cmd/mkmany </sys/src/cmd/mkmany
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common
$O.smtpd:\ $O.smtpd:\

2
sys/src/cmd/upas/spf/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=spf TARG=spf
@ -9,6 +8,7 @@ OFILES=\
spf.$O\ spf.$O\
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
mtest: dns.$O macro.$O mtest.$O mtest: dns.$O macro.$O mtest.$O
$LD $LDFLAGS -o $target $prereq $LD $LDFLAGS -o $target $prereq

2
sys/src/cmd/upas/unesc/mkfile
View file

@ -1,7 +1,7 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=unesc TARG=unesc
OFILES=unesc.$O OFILES=unesc.$O
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas

2
sys/src/cmd/upas/vf/mkfile
View file

@ -1,5 +1,4 @@
</$objtype/mkfile </$objtype/mkfile
<../mkupas
TARG=vf TARG=vf
LIB=../common/libcommon.a$O LIB=../common/libcommon.a$O
@ -9,4 +8,5 @@ HFILES=\
../common/sys.h\ ../common/sys.h\
</sys/src/cmd/mkone </sys/src/cmd/mkone
<../mkupas
CFLAGS=$CFLAGS -I../common CFLAGS=$CFLAGS -I../common