update to split out shared sources

SCCS-vsn: usr.bin/pascal/pxp/Makefile 1.7

diff --git a/usr/src/usr.bin/pascal/pxp/Makefile b/usr/src/usr.bin/pascal/pxp/Makefile
index 01d8e89..ebd3ed9 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/Makefile
+++ b/usr/src/usr.bin/pascal/pxp/Makefile
@@ -1,154 +1,231 @@
-SCCSID = "@(#)Makefile 1.6 (Berkeley) %G%"
+SCCSID = "@(#)Makefile 1.7 (Berkeley) %G%"

 DESTDIR=
 ED=    -ex
 AS=    -as
 DESTDIR=
 ED=    -ex
 AS=    -as

+RM=    rm -f

 EYACC= /usr/ucb/eyacc
 EYACC= /usr/ucb/eyacc

-CFLAGS=        -O -DPXP -w
-OBJS=  call.o case.o const.o cset.o \
-       error.o fdec.o func.o hash.o lab.o lval.o \
-       main.o nl.o pmon.o pp.o proc.o rec.o rval.o \
-       stat.o string.o subr.o tree.o type.o var.o y.tab.o \
-       yycomm.o yycosts.o yyerror.o yyget.o yyid.o yylex.o yymain.o \
-       yypanic.o yyparse.o yyprint.o yyput.o yyrecover.o \
-       yyseman.o yytree.o
-OBJS2= doprnt.o printf.o treen.o yycopy.o TRdata.o Version.o
+CFLAGS=        -O -I. -I${SRCDIR} -w
+SRCDIR=        ../src
+BINDIR=        ../pxp
+#
+# Files which are specific to PXP
+#
+LOCOBJ=        Version.o call.o case.o const.o cset.o error.o fdec.o func.o \
+       lab.o lval.o main.o nl.o pmon.o pp.o proc.o rec.o rval.o stat.o \
+       string.o subr.o type.o var.o y.tab.o yycomm.o yyerror.o yyget.o \
+       yymain.o yyput.o
+#
+# Files which are shared with pi and pc0
+#
+SRCOBJ=        TRdata.o hash.o tree.o treen.o yycopy.o yycosts.o yyid.o yylex.o \
+       yypanic.o yyparse.o yyprint.o yyrecover.o yyseman.o yytree.o
+SRCSRC=        TRdata.c hash.c tree.c treen.c yycopy.c yycosts.c yyid.c yylex.c \
+       yypanic.c yyparse.c yyprint.c yyrecover.c yyseman.c yytree.c

 
 all: a.out
 
 
 all: a.out
 

-a.out: ${OBJS} ${OBJS2}
-       ${CC} ${CFLAGS} ${OBJS} ${OBJS2}
+a.out: ${LOCOBJ} ${SRCOBJ}
+       ${CC} ${CFLAGS} ${LOCOBJ} ${SRCOBJ}

 
 

-doprnt.o: doprnt.c
-       ${CC} ${CFLAGS} -E doprnt.c > doprnt.s
-       ${AS} -o doprnt.o doprnt.s
-       -rm -f doprnt.s
+${SRCOBJ}:
+       -ln ${SRCDIR}/$*.c $*.c
+       ${CC} ${CFLAGS} -c $*.c
+       ${RM} $*.c

 
 

-y.tab.h y.tab.c: pas.y
-       ${EYACC} pas.y >/dev/null
-       ${ED} - y.tab.c < gram
+y.tab.h y.tab.c: ${SRCDIR}/pas.y
+       ${EYACC} ${SRCDIR}/pas.y >/dev/null
+       ${ED} - y.tab.c < ${SRCDIR}/gram
+
+newversion: version
+       version > Version.c

 
 version: version.c Version.o
        cc -o version version.c Version.o
 
 
 version: version.c Version.o
        cc -o version version.c Version.o
 

-newversion: version
-       version > Version.c
+opcode.h: ${SRCDIR}/OPnames.h ${SRCDIR}/opc.c
+       ${RM} opcode.h
+       cc ${SRCDIR}/opc.c -o opc
+       ./opc >opcode.h
+       ${RM} opc

 
 clean:
 
 clean:

-       -rm -f pi1:2strings a.out core
-       -rm -f *.o x* y.tab.c y.tab.h
+       -rm -f a.out core errs version *.bak
+       -rm -f *.o x* y.tab.c y.tab.h opcode.h

 
 install: a.out
        cp a.out ${DESTDIR}/usr/ucb/pxp
 #      cp a.outNOID /usr/ucb/pxp34
 
 print:
 
 install: a.out
        cp a.out ${DESTDIR}/usr/ucb/pxp
 #      cp a.outNOID /usr/ucb/pxp34
 
 print:

-       @pr makefile READ_ME
+       @pr Makefile READ_ME

        @ls -ls | pr
        @size a.out *.o | pr
 #      @cxref *.c | pr
        @ls -ls | pr
        @size a.out *.o | pr
 #      @cxref *.c | pr

-       @pr 0.h main.c pas.y
+       @pr 0.h main.c ${SRCDIR}/pas.y

        @pr yy.h yy*.c
        @pr [a-ln-x]*.c
 #      @pr putn.s treen.s yycopy.s
 
 depend:        
        @pr yy.h yy*.c
        @pr [a-ln-x]*.c
 #      @pr putn.s treen.s yycopy.s
 
 depend:        

-       /bin/grep '^#[  ]*include' *.h \
-               | sed '/<.*>/d' \
-               | sed 's/\(.*\):[^"]*"\([^"]*\)".*/\1: \2/' >makedep
-       /bin/grep '^#[  ]*include' *.c \
-               | sed '/<.*>/d' \
-               | sed 's/:[^"]*"\([^"]*\)".*/: \1/' \
-               | sed 's/\.c/.o/' >>makedep
+       ls *.c | sed 's;^\([a-zA-Z0-9.]*\)\.c;\1.o: &;' >makedep
+       cd ${SRCDIR}; ls ${SRCSRC} | sed \
+               -e 's;^\([a-zA-Z0-9.]*\)\.c;\1.o: ${SRCDIR}/&;' \
+               >>${BINDIR}/makedep
+       /bin/grep '^#[  ]*include' *.h ${SRCDIR}/*.h | sed \
+               -e '/<.*>/d' \
+               -e 's;\(.*\):[^"]*"\([^"]*\)".*;\1: \2;' >>makedep
+       cd ${SRCDIR}; /bin/grep '^#[    ]*include' ${SRCSRC} | sed \
+               -e '/<.*>/d' \
+               -e 's;:[^"]*"\([^"]*\)".*;: ${SRCDIR}/\1;' \
+               -e 's;^\([a-zA-Z0-9.]*\)\.c;\1.o;' \
+               -e 's;: ${SRCDIR}/0.h;: 0.h;' \
+               -e 's;: ${SRCDIR}/whoami.h;: whoami.h;' \
+               -e 's;: ${SRCDIR}/opcode.h;: opcode.h;' >>${BINDIR}/makedep
+       /bin/grep '^#[  ]*include' *.c | sed \
+               -e '/<.*>/d' \
+               -e 's;:[^"]*"\([^"]*\)".*;: ${SRCDIR}/\1;' \
+               -e 's;^\([a-zA-Z0-9.]*\)\.c;\1.o;' \
+               -e 's;: ${SRCDIR}/0.h;: 0.h;' \
+               -e 's;: ${SRCDIR}/whoami.h;: whoami.h;' \
+               -e 's;: ${SRCDIR}/opcode.h;: opcode.h;' >>makedep

        echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
        echo '$$r makedep' >>eddep
        echo 'w' >>eddep
        echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
        echo '$$r makedep' >>eddep
        echo 'w' >>eddep

-       cp makefile makefile.bak
-       ed - makefile < eddep
+       cp Makefile Makefile.bak
+       ed - Makefile < eddep

        rm eddep makedep
        rm eddep makedep

-       echo '# DEPENDENCIES MUST END AT END OF FILE' >> makefile
-       echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> makefile
-       echo '# see make depend above' >> makefile
+       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
+       echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
+       echo '# see make depend above' >> Makefile

 
 # DO NOT DELETE THIS LINE
 # DEPENDENCIES MUST END AT END OF FILE
 
 # DO NOT DELETE THIS LINE
 # DEPENDENCIES MUST END AT END OF FILE

-yy.h: y.tab.h
+Version.o: Version.c
+call.o: call.c
+case.o: case.c
+const.o: const.c
+cset.o: cset.c
+error.o: error.c
+fdec.o: fdec.c
+func.o: func.c
+lab.o: lab.c
+lval.o: lval.c
+main.o: main.c
+nl.o: nl.c
+pmon.o: pmon.c
+pp.o: pp.c
+proc.o: proc.c
+rec.o: rec.c
+rval.o: rval.c
+stat.o: stat.c
+string.o: string.c
+subr.o: subr.c
+type.o: type.c
+var.o: var.c
+version.o: version.c
+yycomm.o: yycomm.c
+yyerror.o: yyerror.c
+yyget.o: yyget.c
+yymain.o: yymain.c
+yyput.o: yyput.c
+TRdata.o: ../src/TRdata.c
+hash.o: ../src/hash.c
+tree.o: ../src/tree.c
+treen.o: ../src/treen.c
+yycopy.o: ../src/yycopy.c
+yycosts.o: ../src/yycosts.c
+yyid.o: ../src/yyid.c
+yylex.o: ../src/yylex.c
+yypanic.o: ../src/yypanic.c
+yyparse.o: ../src/yyparse.c
+yyprint.o: ../src/yyprint.c
+yyrecover.o: ../src/yyrecover.c
+yyseman.o: ../src/yyseman.c
+yytree.o: ../src/yytree.c
+../src/yy.h: y.tab.h

 TRdata.o: whoami.h
 TRdata.o: 0.h
 TRdata.o: whoami.h
 TRdata.o: 0.h

+hash.o: whoami.h
+hash.o: 0.h
+hash.o: ../src/yy.h
+tree.o: whoami.h
+tree.o: 0.h
+yycopy.o: 0.h
+yycopy.o: ../src/yy.h
+yycosts.o: whoami.h
+yycosts.o: 0.h
+yycosts.o: ../src/yy.h
+yyid.o: whoami.h
+yyid.o: 0.h
+yyid.o: ../src/yy.h
+yylex.o: whoami.h
+yylex.o: 0.h
+yylex.o: ../src/yy.h
+yypanic.o: whoami.h
+yypanic.o: 0.h
+yypanic.o: ../src/yy.h
+yyparse.o: whoami.h
+yyparse.o: 0.h
+yyparse.o: ../src/yy.h
+yyprint.o: whoami.h
+yyprint.o: 0.h
+yyprint.o: ../src/yy.h
+yyrecover.o: whoami.h
+yyrecover.o: 0.h
+yyrecover.o: ../src/yy.h
+yyseman.o: whoami.h
+yyseman.o: 0.h
+yyseman.o: ../src/yy.h
+yytree.o: whoami.h
+yytree.o: 0.h
+yytree.o: ../src/tree.h

 call.o: 0.h
 call.o: 0.h

-call.o: tree.h
+call.o: ../src/tree.h

 case.o: 0.h
 case.o: 0.h

-case.o: tree.h
+case.o: ../src/tree.h

 const.o: 0.h
 const.o: 0.h

-const.o: tree.h
+const.o: ../src/tree.h

 cset.o: 0.h
 cset.o: 0.h

-cset.o: tree.h
+cset.o: ../src/tree.h

 error.o: 0.h
 error.o: 0.h

-error.o: yy.h
+error.o: ../src/yy.h

 fdec.o: 0.h
 fdec.o: 0.h

-fdec.o: tree.h
+fdec.o: ../src/tree.h

 func.o: 0.h
 func.o: 0.h

-func.o: tree.h
-hash.o: whoami.h
-hash.o: 0.h
-hash.o: yy.h
+func.o: ../src/tree.h

 lab.o: 0.h
 lval.o: 0.h
 lab.o: 0.h
 lval.o: 0.h

-lval.o: tree.h
+lval.o: ../src/tree.h

 main.o: 0.h
 nl.o: 0.h
 nl.o: opcode.h
 pmon.o: 0.h
 pp.o: 0.h
 proc.o: 0.h
 main.o: 0.h
 nl.o: 0.h
 nl.o: opcode.h
 pmon.o: 0.h
 pp.o: 0.h
 proc.o: 0.h

-proc.o: tree.h
+proc.o: ../src/tree.h

 rec.o: 0.h
 rval.o: 0.h
 rec.o: 0.h
 rval.o: 0.h

-rval.o: tree.h
+rval.o: ../src/tree.h

 stat.o: 0.h
 stat.o: 0.h

-stat.o: tree.h
+stat.o: ../src/tree.h

 string.o: 0.h
 subr.o: 0.h
 string.o: 0.h
 subr.o: 0.h

-tree.o: 0.h

 type.o: 0.h
 type.o: 0.h

-type.o: tree.h
+type.o: ../src/tree.h

 var.o: 0.h
 var.o: 0.h

-var.o: tree.h
-y.tab.o: whoami.h
-y.tab.o: 0.h
-y.tab.o: yy.h
-y.tab.o: tree.h
+var.o: ../src/tree.h
+yycomm.o: whoami.h

 yycomm.o: 0.h
 yycomm.o: 0.h

-yycomm.o: yy.h
-yycopy.o: 0.h
-yycopy.o: yy.h
-yycosts.o: whoami.h
-yycosts.o: 0.h
-yycosts.o: yy.h
+yycomm.o: ../src/yy.h

 yyerror.o: 0.h
 yyerror.o: 0.h

-yyerror.o: yy.h
+yyerror.o: ../src/yy.h

 yyget.o: 0.h
 yyget.o: 0.h

-yyget.o: yy.h
-yyid.o: 0.h
-yyid.o: yy.h
-yylex.o: 0.h
-yylex.o: yy.h
+yyget.o: ../src/yy.h

 yymain.o: 0.h
 yymain.o: 0.h

-yymain.o: yy.h
-yypanic.o: 0.h
-yypanic.o: yy.h
-yyparse.o: 0.h
-yyparse.o: yy.h
-yyprint.o: 0.h
-yyprint.o: yy.h
+yymain.o: ../src/yy.h

 yyput.o: 0.h
 yyput.o: 0.h

-yyput.o: tree.h
-yyput.o: yy.h
-yyrecover.o: 0.h
-yyrecover.o: yy.h
-yyseman.o: 0.h
-yyseman.o: yy.h
-yytree.o: 0.h
-yytree.o: tree.h
+yyput.o: ../src/tree.h
+yyput.o: ../src/yy.h

 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above
 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above