From 9ab5e19576710fa6d5e95a9f5431e76cdcf02836 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Fri, 8 Jul 1988 11:37:17 +0000
Subject: [PATCH] use $(CC) instead of cc

---
 doc/em/Makefile       |  2 +-
 doc/em/int/Makefile   |  4 ++--
 emtest/Makefile       |  2 +-
 mach/6500/dl/Makefile |  2 +-
 mach/pdp/int/Makefile |  2 +-
 util/ack/Makefile     |  2 +-
 util/ack/pc/Makefile  |  2 +-
 util/ass/Makefile     | 24 +++++++-----------------
 util/cgg/Makefile     |  2 +-
 util/topgen/Makefile  |  2 +-
 10 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/doc/em/Makefile b/doc/em/Makefile
index fbb13b18b..5c55ba9f9 100644
--- a/doc/em/Makefile
+++ b/doc/em/Makefile
@@ -28,7 +28,7 @@ dispatdummy:	$(IOP) mkdispatch
 	sed -f dispat3.sed < dispatdummy | $(TBL) > dispat3
 
 mkdispatch:	mkdispatch.c
-	cc -I$(HOME)/util/ass -I$(HOME)/h -o mkdispatch mkdispatch.c $(HOME)/lib/em_data.a
+	$(CC) -I$(HOME)/util/ass -I$(HOME)/h -o mkdispatch mkdispatch.c $(HOME)/lib/em_data.a
 
 .SUFFIXES : .pr .nr
 .nr.pr: ; $(TBL) macr.nr $*.nr | $(NROFF) >$@
diff --git a/doc/em/int/Makefile b/doc/em/int/Makefile
index 8aed29f70..6045a7448 100644
--- a/doc/em/int/Makefile
+++ b/doc/em/int/Makefile
@@ -9,7 +9,7 @@ tables:         mktables $(HOME)/etc/ip_spec.t
 
 mktables:       mktables.c $(HOME)/h/em_spec.h $(HOME)/h/em_flag.h \
 		$(HOME)/lib/em_data.a $(HOME)/util/ass/ip_spec.h
-		cc -I$(HOME) -O -o mktables mktables.c $(HOME)/lib/em_data.a
+		$(CC) -I$(HOME) -O -o mktables mktables.c $(HOME)/lib/em_data.a
 
 em.out:         em.p
 		apc -mint -O em.p >emerrs ; mv e.out em.out
@@ -24,7 +24,7 @@ nem:            nem.p
 		apc -O -i nem.p >emerrs ; mv a.out nem
 
 emdmp:          emdmp.c
-		cc -I$(HOME)/h -o emdmp -O emdmp.c
+		$(CC) -I$(HOME)/h -o emdmp -O emdmp.c
 
 cmp:
 
diff --git a/emtest/Makefile b/emtest/Makefile
index f03bfd0a8..de6428bd1 100644
--- a/emtest/Makefile
+++ b/emtest/Makefile
@@ -16,4 +16,4 @@ last:		tests test.h select
 		echo 0 >last
 
 select:		select.c
-		cc -O -i -o select select.c
+		$(CC) -O -i -o select select.c
diff --git a/mach/6500/dl/Makefile b/mach/6500/dl/Makefile
index 6114ad53c..d1b1ba848 100644
--- a/mach/6500/dl/Makefile
+++ b/mach/6500/dl/Makefile
@@ -2,7 +2,7 @@ EMHOME=../../..
 CFLAGS=-O -I$(EMHOME)/h
 
 dl:             dl.o
-		cc -o dl -n dl.o $(EMHOME)/modules/lib/libobject.a
+		$(CC) -o dl dl.o $(EMHOME)/modules/lib/libobject.a
 
 install:	dl
 		../../install dl
diff --git a/mach/pdp/int/Makefile b/mach/pdp/int/Makefile
index bbdc0f5b8..d689fb262 100644
--- a/mach/pdp/int/Makefile
+++ b/mach/pdp/int/Makefile
@@ -4,7 +4,7 @@ b=../../../lib/em22
 all:	$(INTS) eminform em
 
 em:	em.c
-	cc -o em -I../../../h em.c
+	$(CC) -o em -I../../../h em.c
 
 eminform:	eminform.s
 	as eminform.s;ld -i -o eminform a.out -lc
diff --git a/util/ack/Makefile b/util/ack/Makefile
index 6e5d311ab..e403c253e 100644
--- a/util/ack/Makefile
+++ b/util/ack/Makefile
@@ -66,7 +66,7 @@ dmach.c intable.c: mktables dmach.h
 	mktables $(ACKDIR)
 
 mktables:       mktables.c
-	cc -o mktables mktables.c
+	$(CC) -o mktables mktables.c
 
 pr:
 	@pr Makefile $(HFILES) $(DSRC)
diff --git a/util/ack/pc/Makefile b/util/ack/pc/Makefile
index 2b3f103fd..777a53f63 100644
--- a/util/ack/pc/Makefile
+++ b/util/ack/pc/Makefile
@@ -6,7 +6,7 @@ PC_PATH=$(EMHOME)/lib/em_pc
 LDFLAGS = -i
 
 em_pc:          em_pc.c $h/local.h $h/em_path.h
-		cc $(LDFLAGS) -o em_pc -O -I$h em_pc.c
+		$(CC) $(LDFLAGS) -o em_pc -O -I$h em_pc.c
 
 cmp:            em_pc
 		cmp em_pc $(PC_PATH)
diff --git a/util/ass/Makefile b/util/ass/Makefile
index d93c2586c..4a9f8cfb2 100644
--- a/util/ass/Makefile
+++ b/util/ass/Makefile
@@ -5,23 +5,21 @@ h=$d/h
 m=$d/man
 ASS_PATH=$l/em_ass
 
-SEP_OPT=-i
-
 CFLAGS=-O
 
-all:            ass$(SEP_OPT)
+all:            ass
 
 clean:
-		-rm -f ass-i ass-n *.o maktab *.old asstb.c
+		-rm -f ass *.o maktab *.old asstb.c
 
 install :       all
 		rm -f $(ASS_PATH)
-		cp ass$(SEP_OPT) $(ASS_PATH)
+		cp ass $(ASS_PATH)
 		rm -f $m/em_ass.6
 		cp em_ass.6 $m/em_ass.6
 
 cmp :           all
-		-cmp ass$(SEP_OPT) $(ASS_PATH)
+		-cmp ass $(ASS_PATH)
 		-cmp em_ass.6 $m/em_ass.6
 
 lint:           ass00.c ass30.c ass40.c ass50.c ass60.c ass70.c \
@@ -31,18 +29,10 @@ lint:           ass00.c ass30.c ass40.c ass50.c ass60.c ass70.c \
 			ass80.c assci.c assda.c assrl.c asstb.c asscm.c
 
 
-ass-n:       ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
+ass:       ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
 			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
 			$l/em_data.a
-		cc -n $(CFLAGS) -o ass-n \
-			ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a
-
-ass-i:       ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a
-		cc -i $(CFLAGS) -o ass-i \
+		$(CC) -i $(CFLAGS) -o ass \
 			ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
 			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
 			$l/em_data.a
@@ -73,7 +63,7 @@ asstb.c:        maktab $d/etc/ip_spec.t
 
 maktab:         maktab.c $h/em_spec.h ip_spec.h $h/em_flag.h \
 		$l/em_data.a
-		cc -O -o maktab maktab.c $l/em_data.a
+		$(CC) -O -o maktab maktab.c $l/em_data.a
 
 asprint:	asprint.p
 		apc -w -o asprint asprint.p
diff --git a/util/cgg/Makefile b/util/cgg/Makefile
index 4b47a6da5..22f87ebbe 100644
--- a/util/cgg/Makefile
+++ b/util/cgg/Makefile
@@ -9,7 +9,7 @@ LIBS=../../lib/em_data.a
 LEXLIB=-lln
 
 cgg:	bootgram.o
-	cc $(LDFLAGS) bootgram.o $(LIBS) $(LEXLIB) -o cgg
+	$(CC) $(LDFLAGS) bootgram.o $(LIBS) $(LEXLIB) -o cgg
 
 bootgram.c:	bootgram.y
 	@echo expect 1 shift/reduce conflict
diff --git a/util/topgen/Makefile b/util/topgen/Makefile
index 2feeeae72..40687ea18 100644
--- a/util/topgen/Makefile
+++ b/util/topgen/Makefile
@@ -28,7 +28,7 @@ hash.o:		misc.h
 pattern.o:	misc.h symtab.h
 
 topgen:		$(OFILES)
-		cc $(OFILES) -o topgen
+		$(CC) $(OFILES) -o topgen
 
 lint:		parser
 		lint $(CFILES)