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

upas/*: cleanup mkfiles (thanks amavect)

Browse source 
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.
This commit is contained in:
Ori Bernstein 2020-11-17 18:37:38 -08:00
parent 972f95aa63
commit 1e3dd86128
25 changed files with 97 additions and 298 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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

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

@ -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

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

@ -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

18
sys/src/cmd/upas/binscripts/mkfile.rc
View file

@ -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

9
sys/src/cmd/upas/common/mkfile
View file

@ -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]

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

@ -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

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

@ -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

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

@ -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

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

@ -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

52
sys/src/cmd/upas/mkfile
View file

@ -24,46 +24,10 @@ PROGS=\
#libs must be made first
DIRS=$LIBS $PROGS
UPDATE=\
mkfile\
/sys/man/1/mail\
all:V:
all install installall clean nuke: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:
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
}

2
sys/src/cmd/upas/mkupas
View file

@ -2,4 +2,4 @@ BIN=/$objtype/bin/upas
ABIN=/acme/bin/$objtype
../common/libcommon.a$O:
cd ../common; mk; mk clean
cd ../common; mk

2
sys/src/cmd/upas/ml/dat.h
View file

@ -1,6 +1,6 @@
#include "../smtp/smtp.h"
#include "../smtp/y.tab.h"
#include "../smtp/rfc822.tab.h"
typedef struct Addr Addr;
struct Addr

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

@ -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

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

@ -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

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

@ -2,15 +2,8 @@
<../mkupas
TARG=pop3
LIB=../common/libcommon.a$O
OFILES=pop3.$O
LIB=../common/libcommon.a$O
UPDATE=\
mkfile\
${OFILES:%.$O=%.c}\
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common

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

@ -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

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

@ -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

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

@ -1,25 +1,20 @@
</$objtype/mkfile
<../mkupas
TARG=scanmail\
TARG=\
scanmail\
testscan
OFILES= common.$O
LIB=../common/libcommon.a$O
HFILES= spam.h\
OFILES=common.$O
HFILES=\
spam.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
<../mkupas
scanmail.$O: scanmail.c
scanmail.$O: scanmail.c
$CC $CFLAGS scanmail.c

2
sys/src/cmd/upas/send/message.c
View file

@ -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,

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

@ -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

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

@ -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\
UPDATE=\
greylist.c\
mkfile\
mxdial.c\
rfc822.y\
smtpd.y\
spam.c\
$HFILES\
${OFILES:%.$O=%.c}\
${TARG:%=%.c}\
TEST=parsetest
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

2
sys/src/cmd/upas/smtp/smtpd.c
View file

@ -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="";

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

@ -2,11 +2,6 @@
<../mkupas
TARG=unesc
OFILES=unesc.$O\
UPDATE=\
mkfile\
$HFILES\
${OFILES:%.$O=%.c}\
OFILES=unesc.$O
</sys/src/cmd/mkone

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

@ -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