merging erik quanstros nupas

[plan9front.git] / sys / src / cmd / upas / smtp / mkfile

diff --git a/sys/src/cmd/upas/smtp/mkfile b/sys/src/cmd/upas/smtp/mkfile
index 10b312b90b7b0848e78f753313795ccc62c2f847..9f02f8ae2a4dbeaae8a95271b4db8c3a6ea58cbb 100644 (file)
--- a/sys/src/cmd/upas/smtp/mkfile
+++ b/sys/src/cmd/upas/smtp/mkfile
@@ -1,8 +1,12 @@
 </$objtype/mkfile
+<../mkupas
 
 TARG = smtpd\
        smtp\
 
+TEST=\
+       parsetest
+
 OFILES=
 
 LIB=../common/libcommon.a$O\
@@ -12,13 +16,11 @@ HFILES=../common/common.h\
        smtpd.h\
        smtp.h\
 
-BIN=/$objtype/bin/upas
 UPDATE=\
        greylist.c\
        mkfile\
        mxdial.c\
        rfc822.y\
-       rmtdns.c\
        smtpd.y\
        spam.c\
        $HFILES\
@@ -26,24 +28,30 @@ UPDATE=\
        ${TARG:%=%.c}\
 
 </sys/src/cmd/mkmany
-CFLAGS=$CFLAGS -I../common -D'SPOOL="/mail"'
+CFLAGS=$CFLAGS -I../common
+
+$O.smtpd:\
+       smtpd.tab.$O\
+       spam.$O\
+       rfc822.tab.$O\
+       greylist.$O\
 
-$O.smtpd:      smtpd.tab.$O rmtdns.$O spam.$O rfc822.tab.$O greylist.$O
 $O.smtp:       rfc822.tab.$O mxdial.$O
 
-smtpd.tab.c:   smtpd.y
+smtpd.tab.c: smtpd.y
        yacc -o xxx smtpd.y
        sed 's/yy/zz/g' < xxx > $target
        rm xxx
 
-rfc822.tab.c:  rfc822.y
+rfc822.tab.c: rfc822.y
        yacc -d -o $target rfc822.y
 
+$O.parsetest: rfc822.tab.$O
+
+parsetest.$O: rfc822.tab.$O
+
 clean:V:
-       rm -f *.[$OS] [$OS].$TARG smtpd.tab.c rfc822.tab.c y.tab.? y.debug $TARG
+       rm -f *.[$OS] [$OS].^($TARG $TEST) smtpd.tab.c rfc822.tab.c y.tab.? y.debug $TARG
 
 ../common/libcommon.a$O:
-       @{      
-               cd ../common
-               mk
-       }
+       cd ../common && mk