define DESTDIR, add forgotten dependencies

[unix-history] / usr / src / usr.bin / pascal / pcexterns / Makefile

diff --git a/usr/src/usr.bin/pascal/pcexterns/Makefile b/usr/src/usr.bin/pascal/pcexterns/Makefile
index 3a6e4a8..e2260d0 100644 (file)
--- a/usr/src/usr.bin/pascal/pcexterns/Makefile
+++ b/usr/src/usr.bin/pascal/pcexterns/Makefile
@@ -1,4 +1,4 @@
-SCCSID = @(#)Makefile 1.7 %G%
+SCCSID = @(#)Makefile 1.10 %G%

 INSTALL = ${DESTDIR}/usr/ucb
 INSTALLIB = ${DESTDIR}/usr/lib
 PX_HEADER = px_header
 INSTALL = ${DESTDIR}/usr/ucb
 INSTALLIB = ${DESTDIR}/usr/lib
 PX_HEADER = px_header


@@ -17,39 +17,47 @@ install: all pxref.p
        cp pmerge ${INSTALL}/pmerge
        -pc -w pxref.p -o ${INSTALL}/pxref
 
        cp pmerge ${INSTALL}/pmerge
        -pc -w pxref.p -o ${INSTALL}/pxref
 

-pix: pix.c
-       ${CC} -O -o pix pix.c
+pix: pix.c config.o
+       ${CC} -O -o pix pix.c config.o

 
 pmerge: pmerge.c
        ${CC} -O -o pmerge pmerge.c
 
 
 pmerge: pmerge.c
        ${CC} -O -o pmerge pmerge.c
 

-px_header: px_header.c objfmt.h
-       ${CC} -O -d2 -o px_header px_header.c -N
+px_header: px_header.c objfmt.h config.o
+       ${CC} -O -o px_header px_header.c config.o -N

        strip px_header
 
 pc2: pc2.c
        ${CC} pc2.c -lpc -o tmp
        ${CC} -S pc2.c
        strip px_header
 
 pc2: pc2.c
        ${CC} pc2.c -lpc -o tmp
        ${CC} -S pc2.c

-       ./tmp pc2.s | as -d2 -o pc2.o
+       ./tmp pc2.s | as -o pc2.o

        ${CC} pc2.o -o pc2
        rm -f pc2.o pc2.s tmp
 
 pc3: pc3.c pc3.h pstab.h
        ${CC} pc2.o -o pc2
        rm -f pc2.o pc2.s tmp
 
 pc3: pc3.c pc3.h pstab.h

-       ${CC} -O -d2 pc3.c -o pc3
+       ${CC} -O pc3.c -o pc3

 
 pxref: pxref.p
        pc -w pxref.p -o pxref
 
 pc: pc.c
 
 pxref: pxref.p
        pc -w pxref.p -o pxref
 
 pc: pc.c

-       ${CC} -O -d2 -o pc pc.c
+       ${CC} -O -o pc pc.c

 
 LIBRARIES = /usr/lib/libpc.a /lib/libc.a /usr/lib/libm.a /usr/lib/libg.a
 
 pcexterns.o: pcexterns.awk ${LIBRARIES}
 
 LIBRARIES = /usr/lib/libpc.a /lib/libc.a /usr/lib/libm.a /usr/lib/libg.a
 
 pcexterns.o: pcexterns.awk ${LIBRARIES}

-       ${NM} /usr/lib/libpc.a | awk -f pcexterns.awk >pcexterns.s
-       ${NM} /lib/libc.a | awk -f pcexterns.awk >>pcexterns.s
-       ${NM} /usr/lib/libm.a | awk -f pcexterns.awk >>pcexterns.s
-       ${NM} /usr/lib/libg.a | awk -f pcexterns.awk >>pcexterns.s
+       ${NM} /usr/lib/libpc.a \
+               | awk -f pcexterns.awk \
+               | sort -t\" +1 -2 -u >pcexterns.s
+       ${NM} /lib/libc.a \
+               | awk -f pcexterns.awk \
+               | sort -t\" +1 -2 -u >>pcexterns.s
+       ${NM} /usr/lib/libm.a \
+               | awk -f pcexterns.awk \
+               | sort -t\" +1 -2 -u >>pcexterns.s
+       ${NM} /usr/lib/libg.a \
+               | awk -f pcexterns.awk \
+               | sort -t\" +1 -2 -u >>pcexterns.s

        as pcexterns.s -o pcexterns.o
        ${RM} pcexterns.s
 
        as pcexterns.s -o pcexterns.o
        ${RM} pcexterns.s