mods to use ../src

SCCS-vsn: usr.bin/pascal/px/Makefile 1.17

diff --git a/usr/src/usr.bin/pascal/px/Makefile b/usr/src/usr.bin/pascal/px/Makefile
index c1a0630..d0dcb7b 100644 (file)
--- a/usr/src/usr.bin/pascal/px/Makefile
+++ b/usr/src/usr.bin/pascal/px/Makefile
@@ -1,18 +1,17 @@
-SCCSID = "@(#)Makefile 1.16 %G%"
+SCCSID = "@(#)Makefile 1.17 %G%"

 
 

-CFLAGS = -O

 DESTDIR =
 DESTDIR =

-SRCDIR = /usr/ucb
+BINDIR = /usr/ucb

 LIBDIR = /usr/lib
 LIBDIR = /usr/lib

-PASCALDIR = /usr/src/ucb/pascal
+SRCDIR = ../src

 LIBPCDIR = /usr/src/usr.lib/libpc
 CC = cc
 LIBPCDIR = /usr/src/usr.lib/libpc
 CC = cc

+CFLAGS = -O -I${SRCDIR} -I${LIBPCDIR}

 OPT = /lib/c2
 AS = as
 RM = rm -f
 
 OPT = /lib/c2
 AS = as
 RM = rm -f
 

-PSHDR =        OPnames.h whoami.h objfmt.h opc.c pic.c
-PCHDR =        libpc.h
+PSHDR =        opc.c pic.c

 
 PXHDR =        vars.h machdep.h
 
 
 PXHDR =        vars.h machdep.h
 


@@ -32,50 +31,51 @@ Version.c: version.c
        ./version >Version.c
        ${RM}  version
 interp.o interp.s: interp.c interp.sed
        ./version >Version.c
        ${RM}  version
 interp.o interp.s: interp.c interp.sed

-       ${CC} -S interp.c
+       ${CC} -S -I${SRCDIR} -I${LIBPCDIR} interp.c

        sed -f interp.sed <interp.s >tmp
        ${OPT} tmp interp.s
        /usr/lib/pc2 <interp.s >tmp
        mv tmp interp.s
        as -o interp.o interp.s
        sed -f interp.sed <interp.s >tmp
        ${OPT} tmp interp.s
        /usr/lib/pc2 <interp.s >tmp
        mv tmp interp.s
        as -o interp.o interp.s

-h02opcs.h: OPnames.h opc.c
+h02opcs.h: ${SRCDIR}/OPnames.h opc.c

        ${CC} ${CFLAGS} opc.c -o opc
        ./opc >h02opcs.h
        ${RM} opc
 
 install: px
        ${CC} ${CFLAGS} opc.c -o opc
        ./opc >h02opcs.h
        ${RM} opc
 
 install: px

-       cp px ${DESTDIR}/usr/ucb/px
+       install px ${DESTDIR}/usr/ucb/px

 
 sources: ${PXHDR} ${PXSRC} ${PXUTL}
 ${PSHDR}:
 
 sources: ${PXHDR} ${PXSRC} ${PXUTL}
 ${PSHDR}:

-       cp ${PASCALDIR}/$@ $@
-${PCHDR}:
-       cp ${LIBPCDIR}/$@ $@
+       ln -s ${SRCDIR}/$@ $@

 
 clean:
        ${RM} *.o *.s px version opc* pic*
 
 clean:
        ${RM} *.o *.s px version opc* pic*

-       ${RM} OPnames.h objfmt.h libpc.h h02opcs.h errs lpr core tmp
+       ${RM} h02opcs.h errs lpr core tmp

 
 prt: interp.s
        sed -f clean.sed <interp.s
 
 
 prt: interp.s
        sed -f clean.sed <interp.s
 

-grind: sources ${PSHDR} ${PCHDR}
-       ${SRCDIR}/ctags -v *.h *.c *.s | sort -f >index
-       ${SRCDIR}/vgrind -t -x index >lpr
+grind: sources
+       ${BINDIR}/ctags -v *.h *.c *.s | sort -f >index
+       ${BINDIR}/vgrind -t -x index >lpr

        ${CC} ${CFLAGS} -o pic pic.c
        ${CC} ${CFLAGS} -o pic pic.c

-       ${SRCDIR}/vgrind -t -n READ_ME Makefile lst >>lpr
-       ${SRCDIR}/vgrind -t ${PCHDR} ${PXHDR} objfmt.h whoami.h >>lpr
-       ${SRCDIR}/vgrind -t ${PXSRC} >>lpr
+       ${BINDIR}/vgrind -t -n READ_ME Makefile lst >>lpr
+       ${BINDIR}/vgrind -t ${PXSRC} >>lpr

        ./pic >lst
        ./pic >lst

-       ${SRCDIR}/vpr lst
-       ${SRCDIR}/vpr -t lpr
+       ${BINDIR}/vpr lst
+       ${BINDIR}/vpr -t lpr

        ${RM} index pic lst
 
 depend:        sources
        ${RM} index pic lst
 
 depend:        sources

-       /bin/grep '^#[  ]*include' *.c \
-               | sed '/<.*>/d' \
-               | sed 's/:[^"]*"\([^"]*\)".*/: \1/' \
-               | sed 's/\.c/.o/' >makedep
+       ls *.c | sed 's;^\(.*\)\.c;\1.o: \1.c;' >makedep
+       /bin/grep '^#[  ]*include' *.c | sed \
+               -e '/<.*>/d' \
+               -e 's;:[^"]*"\([^"]*\)".*;: \1;' \
+               -e 's/\.c/\.o/' \
+               -e 's;: libpc.h;: ${LIBPCDIR}/libpc.h;' \
+               -e 's;: objfmt.h;: ${SRCDIR}/objfmt.h;' \
+               -e 's;: OPnames.h;: ${SRCDIR}/OPnames.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


@@ -88,20 +88,26 @@ depend:     sources
 
 # DO NOT DELETE THIS LINE -- make depend uses it
 # DEPENDENCIES MUST END AT END OF FILE
 
 # DO NOT DELETE THIS LINE -- make depend uses it
 # DEPENDENCIES MUST END AT END OF FILE

+Version.o: Version.c
+int.o: int.c
+interp.o: interp.c
+opc.o: opc.c
+utilities.o: utilities.c
+version.o: version.c

 int.o: whoami.h
 int.o: vars.h
 int.o: whoami.h
 int.o: vars.h

-int.o: libpc.h
-int.o: objfmt.h
+int.o: /usr/src/usr.lib/libpc/libpc.h
+int.o: ../src/objfmt.h

 interp.o: whoami.h
 interp.o: vars.h
 interp.o: whoami.h
 interp.o: vars.h

-interp.o: objfmt.h
+interp.o: ../src/objfmt.h

 interp.o: h02opcs.h
 interp.o: machdep.h
 interp.o: h02opcs.h
 interp.o: machdep.h

-interp.o: libpc.h
-opc.o: OPnames.h
+interp.o: /usr/src/usr.lib/libpc/libpc.h
+opc.o: ../src/OPnames.h

 utilities.o: whoami.h
 utilities.o: vars.h
 utilities.o: whoami.h
 utilities.o: vars.h

-utilities.o: objfmt.h
+utilities.o: ../src/objfmt.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