diff options
-rw-r--r-- | sys/src/cmd/upas/Mail/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/alias/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/bayes/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/binscripts/mkfile | 3 | ||||
-rw-r--r-- | sys/src/cmd/upas/filterkit/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/fs/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/imap4d/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/marshal/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/ml/mkfile | 4 | ||||
-rw-r--r-- | sys/src/cmd/upas/ned/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/pop3/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/q/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/qfrom/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/scanmail/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/send/mkfile | 4 | ||||
-rw-r--r-- | sys/src/cmd/upas/smtp/mkfile | 4 | ||||
-rw-r--r-- | sys/src/cmd/upas/spf/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/unesc/mkfile | 2 | ||||
-rw-r--r-- | sys/src/cmd/upas/vf/mkfile | 2 |
19 files changed, 23 insertions, 22 deletions
diff --git a/sys/src/cmd/upas/Mail/mkfile b/sys/src/cmd/upas/Mail/mkfile index 0055f3dee..7ddbe41ee 100644 --- a/sys/src/cmd/upas/Mail/mkfile +++ b/sys/src/cmd/upas/Mail/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=Mail OFILES=\ @@ -16,6 +15,7 @@ HFILES=dat.h BIN=$ABIN </sys/src/cmd/mkone +<../mkupas $O.out: $OFILES $LD -o $target $LDFLAGS $OFILES diff --git a/sys/src/cmd/upas/alias/mkfile b/sys/src/cmd/upas/alias/mkfile index 900fa12cd..905ee42bb 100644 --- a/sys/src/cmd/upas/alias/mkfile +++ b/sys/src/cmd/upas/alias/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=aliasmail LIB=../common/libcommon.a$O @@ -9,4 +8,5 @@ HFILES=\ ../common/sys.h\ </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/bayes/mkfile b/sys/src/cmd/upas/bayes/mkfile index bc63acd27..e5640cd4e 100644 --- a/sys/src/cmd/upas/bayes/mkfile +++ b/sys/src/cmd/upas/bayes/mkfile @@ -1,9 +1,9 @@ </$objtype/mkfile -<../mkupas TARG=addhash bayes msgtok </sys/src/cmd/mkmany +<../mkupas # msg tokenizer $O.regen: regcomp.$O dfa.$O diff --git a/sys/src/cmd/upas/binscripts/mkfile b/sys/src/cmd/upas/binscripts/mkfile index 1edc72051..88cdcf573 100644 --- a/sys/src/cmd/upas/binscripts/mkfile +++ b/sys/src/cmd/upas/binscripts/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas RCFILES=\ isspam\ @@ -27,3 +26,5 @@ nuke:V: $BIN/%: %.rc cp $stem.rc $BIN/$stem + +<../mkupas diff --git a/sys/src/cmd/upas/filterkit/mkfile b/sys/src/cmd/upas/filterkit/mkfile index 8584374f7..06a456123 100644 --- a/sys/src/cmd/upas/filterkit/mkfile +++ b/sys/src/cmd/upas/filterkit/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ deliver\ @@ -11,4 +10,5 @@ LIB=../common/libcommon.a$O OFILES=readaddrs.$O </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/fs/mkfile b/sys/src/cmd/upas/fs/mkfile index 095991cef..0621aa8c4 100644 --- a/sys/src/cmd/upas/fs/mkfile +++ b/sys/src/cmd/upas/fs/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=fs LIB=../common/libcommon.a$O @@ -24,6 +23,7 @@ HFILES=\ dat.h\ </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common acid:V: diff --git a/sys/src/cmd/upas/imap4d/mkfile b/sys/src/cmd/upas/imap4d/mkfile index 4ae435944..af03e1aac 100644 --- a/sys/src/cmd/upas/imap4d/mkfile +++ b/sys/src/cmd/upas/imap4d/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=imap4d @@ -31,3 +30,4 @@ HFILES=\ fns.h\ </sys/src/cmd/mkone +<../mkupas diff --git a/sys/src/cmd/upas/marshal/mkfile b/sys/src/cmd/upas/marshal/mkfile index a2e517cb0..af7c02e3d 100644 --- a/sys/src/cmd/upas/marshal/mkfile +++ b/sys/src/cmd/upas/marshal/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=marshal LIB=../common/libcommon.a$O @@ -7,5 +6,6 @@ OFILES=marshal.$O HFILES=../common/common.h </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/ml/mkfile b/sys/src/cmd/upas/ml/mkfile index c87953545..8af0f7d23 100644 --- a/sys/src/cmd/upas/ml/mkfile +++ b/sys/src/cmd/upas/ml/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ ml\ @@ -17,10 +16,11 @@ HFILES=\ ../smtp/rfc822.tab.h\ </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common $O.ml: ../smtp/rfc822.tab.$O $O.mlowner: ../smtp/rfc822.tab.$O ../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 diff --git a/sys/src/cmd/upas/ned/mkfile b/sys/src/cmd/upas/ned/mkfile index 917108130..10011f8b1 100644 --- a/sys/src/cmd/upas/ned/mkfile +++ b/sys/src/cmd/upas/ned/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=nedmail LIB=../common/libcommon.a$O @@ -7,4 +6,5 @@ OFILES=nedmail.$O HFILES=../common/common.h </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/pop3/mkfile b/sys/src/cmd/upas/pop3/mkfile index ee96f9703..04803f82e 100644 --- a/sys/src/cmd/upas/pop3/mkfile +++ b/sys/src/cmd/upas/pop3/mkfile @@ -1,9 +1,9 @@ </$objtype/mkfile -<../mkupas TARG=pop3 LIB=../common/libcommon.a$O OFILES=pop3.$O </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/q/mkfile b/sys/src/cmd/upas/q/mkfile index 45b6afa2e..a0a2dbcd9 100644 --- a/sys/src/cmd/upas/q/mkfile +++ b/sys/src/cmd/upas/q/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ qer\ @@ -12,4 +11,5 @@ HFILES=\ ../common/sys.h\ </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common diff --git a/sys/src/cmd/upas/qfrom/mkfile b/sys/src/cmd/upas/qfrom/mkfile index 33a6006c6..015000920 100644 --- a/sys/src/cmd/upas/qfrom/mkfile +++ b/sys/src/cmd/upas/qfrom/mkfile @@ -1,7 +1,7 @@ </$objtype/mkfile -<../mkupas TARG=qfrom OFILES=qfrom.$O </sys/src/cmd/mkone +<../mkupas diff --git a/sys/src/cmd/upas/scanmail/mkfile b/sys/src/cmd/upas/scanmail/mkfile index 7223794cf..24616fc06 100644 --- a/sys/src/cmd/upas/scanmail/mkfile +++ b/sys/src/cmd/upas/scanmail/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ scanmail\ @@ -14,6 +13,7 @@ HFILES=\ ../common/sys.h\ </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common scanmail.$O: scanmail.c diff --git a/sys/src/cmd/upas/send/mkfile b/sys/src/cmd/upas/send/mkfile index 699374dd8..f4b188c9c 100644 --- a/sys/src/cmd/upas/send/mkfile +++ b/sys/src/cmd/upas/send/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ send\ @@ -32,6 +31,7 @@ HFILES=\ ../common/sys.h\ </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common $O.send: $SOBJ $OFILES @@ -42,4 +42,4 @@ $O.filter: $FOBJ message.$O: ../smtp/rfc822.tab.h ../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 diff --git a/sys/src/cmd/upas/smtp/mkfile b/sys/src/cmd/upas/smtp/mkfile index 922b56137..ab8bc1810 100644 --- a/sys/src/cmd/upas/smtp/mkfile +++ b/sys/src/cmd/upas/smtp/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=\ smtpd\ @@ -16,9 +15,10 @@ HFILES=\ TEST=parsetest -CLEANFILES=*.tab.? +CLEANFILES=rfc822.tab.h rfc822.tab.c smtpd.tab.c </sys/src/cmd/mkmany +<../mkupas CFLAGS=$CFLAGS -I../common $O.smtpd:\ diff --git a/sys/src/cmd/upas/spf/mkfile b/sys/src/cmd/upas/spf/mkfile index f612714f9..68d22ae0d 100644 --- a/sys/src/cmd/upas/spf/mkfile +++ b/sys/src/cmd/upas/spf/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=spf @@ -9,6 +8,7 @@ OFILES=\ spf.$O\ </sys/src/cmd/mkone +<../mkupas mtest: dns.$O macro.$O mtest.$O $LD $LDFLAGS -o $target $prereq diff --git a/sys/src/cmd/upas/unesc/mkfile b/sys/src/cmd/upas/unesc/mkfile index c5be446cf..3523d16e6 100644 --- a/sys/src/cmd/upas/unesc/mkfile +++ b/sys/src/cmd/upas/unesc/mkfile @@ -1,7 +1,7 @@ </$objtype/mkfile -<../mkupas TARG=unesc OFILES=unesc.$O </sys/src/cmd/mkone +<../mkupas diff --git a/sys/src/cmd/upas/vf/mkfile b/sys/src/cmd/upas/vf/mkfile index b60bebad7..7abe8dcd8 100644 --- a/sys/src/cmd/upas/vf/mkfile +++ b/sys/src/cmd/upas/vf/mkfile @@ -1,5 +1,4 @@ </$objtype/mkfile -<../mkupas TARG=vf LIB=../common/libcommon.a$O @@ -9,4 +8,5 @@ HFILES=\ ../common/sys.h\ </sys/src/cmd/mkone +<../mkupas CFLAGS=$CFLAGS -I../common |