From 8bcf143110483e4d7b67e328fc77d048cd2aa6b6 Mon Sep 17 00:00:00 2001 From: Bill Joy Date: Mon, 4 Aug 1980 03:22:48 -0800 Subject: [PATCH] use ${CC}, ${AS}; don't delete source on sccs clean SCCS-vsn: usr.bin/ex/Makefile 4.7 SCCS-vsn: usr.bin/ex/OTHER/makefile.70 4.7 --- usr/src/usr.bin/ex/Makefile | 17 ++++------------- usr/src/usr.bin/ex/OTHER/makefile.70 | 17 ++++------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/usr/src/usr.bin/ex/Makefile b/usr/src/usr.bin/ex/Makefile index a57acbe927..add65d42e9 100644 --- a/usr/src/usr.bin/ex/Makefile +++ b/usr/src/usr.bin/ex/Makefile @@ -61,7 +61,7 @@ VHDR= "Ex Version ${VERSION}" mv x.o $*.o a.out: ${OBJS} - cc ${LDFLAGS} ${OBJS} ${TERMLIB} + ${CC} ${LDFLAGS} ${OBJS} ${TERMLIB} all: a.out exrecover expreserve tags @@ -74,14 +74,14 @@ ${OBJS}: ex_vars.h # csh makeoptions ${CFLAGS} bcopy.o: bcopy.c - cc -c ${CFLAGS} bcopy.c + ${CC} -c ${CFLAGS} bcopy.c # xstr: hands off! strings.o: strings ${XSTR} ${CC} -c -S xs.c ed - <:rofix xs.s - as -o strings.o xs.s + ${AS} -o strings.o xs.s rm xs.s exrecover: exrecover.o @@ -96,20 +96,11 @@ expreserve: expreserve.o expreserve.o: ${CC} ${CFLAGS} -c -O expreserve.c -simpclean: +clean: # If we dont have ex we cant make it so dont rm ex_vars.h -rm -f a.out exrecover expreserve strings core errs trace -rm -f *.o x*.[cs] -clean: simpclean - -rm -f ${HDRS} - -rm -f ${SRC1} - -rm -f ${SRC2} - -rm -f ${SRC3} - -rm -f ${SRC4} - -rm -f ${SRC5} - -rm -f ${SRC6} - # install a new version for testing in /usr/new ninstall: a.out -rm -f ${DESTDIR}${NBINDIR}/ex ${DESTDIR}${NBINDIR}/vi ${DESTDIR}${NBINDIR}/view diff --git a/usr/src/usr.bin/ex/OTHER/makefile.70 b/usr/src/usr.bin/ex/OTHER/makefile.70 index a57acbe927..add65d42e9 100644 --- a/usr/src/usr.bin/ex/OTHER/makefile.70 +++ b/usr/src/usr.bin/ex/OTHER/makefile.70 @@ -61,7 +61,7 @@ VHDR= "Ex Version ${VERSION}" mv x.o $*.o a.out: ${OBJS} - cc ${LDFLAGS} ${OBJS} ${TERMLIB} + ${CC} ${LDFLAGS} ${OBJS} ${TERMLIB} all: a.out exrecover expreserve tags @@ -74,14 +74,14 @@ ${OBJS}: ex_vars.h # csh makeoptions ${CFLAGS} bcopy.o: bcopy.c - cc -c ${CFLAGS} bcopy.c + ${CC} -c ${CFLAGS} bcopy.c # xstr: hands off! strings.o: strings ${XSTR} ${CC} -c -S xs.c ed - <:rofix xs.s - as -o strings.o xs.s + ${AS} -o strings.o xs.s rm xs.s exrecover: exrecover.o @@ -96,20 +96,11 @@ expreserve: expreserve.o expreserve.o: ${CC} ${CFLAGS} -c -O expreserve.c -simpclean: +clean: # If we dont have ex we cant make it so dont rm ex_vars.h -rm -f a.out exrecover expreserve strings core errs trace -rm -f *.o x*.[cs] -clean: simpclean - -rm -f ${HDRS} - -rm -f ${SRC1} - -rm -f ${SRC2} - -rm -f ${SRC3} - -rm -f ${SRC4} - -rm -f ${SRC5} - -rm -f ${SRC6} - # install a new version for testing in /usr/new ninstall: a.out -rm -f ${DESTDIR}${NBINDIR}/ex ${DESTDIR}${NBINDIR}/vi ${DESTDIR}${NBINDIR}/view -- 2.20.1