Makefile cleanup, no seperate middle preprocessing steps anymore

1 files changed, 15 insertions, 27 deletions

diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile
index c1d783c24..766cf683d 100644
--- a/system/alpha/console/Makefile
+++ b/system/alpha/console/Makefile
@@ -1,9 +1,5 @@
 DBMENTRY	= fffffc0000010000
-INCLUDES        = -I$(PALCODE) -I$(INCLUDEH) -I$(M5)/dev
-
-SOURDIR = ./
-PALCODE  = ../palcode
-INCLUDEH = ../h
+CFLAGS=-I . -I ../h -I$(M5)/dev -nostdinc++ -Wa,-m21164
 
 ARCHNAME=$(shell uname -m)
 
@@ -11,10 +7,13 @@ ARCHNAME=$(shell uname -m)
 ifneq ($(ARCHNAME), alpha)
 CC=alpha-unknown-linux-gnu-gcc
 AS=alpha-unknown-linux-gnu-as
-CXX=alpha-unknown-linux-gnu-g++
 LD=alpha-unknown-linux-gnu-ld
 endif
 
+OBJS=dbmentry.o printf.o paljtokern.o paljtoslave.o
+TLOBJS+=$(OBJS) console_tl.o
+TSOBJS+=$(OBJS) console_ts.o
+
 ### Make sure that the M5 variable is set ###
 ifndef M5
 $(error The M5 variable must be set)
@@ -22,37 +21,26 @@ endif
 
 all: console_tl console_ts
 
-dbmentry.o: dbmentry.s 
-	g++ -I ../h -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ dbmentry.s | \
-	$(AS) -m 21164 -o dbmentry.s.o
+%.o: %.S
+	$(CC) $(CFLAGS) -nostdinc -o $@ -c $<
 
 console_ts.o: console.c
-	$(CC)  -g3 $(INCLUDES) -D _TIME_T -D TSUNAMI -nostdinc++ -o console_ts.o -c console.c
+	$(CC)  -g3 $(CFLAGS) -D _TIME_T -D TSUNAMI -o $@ -c $<
 
 console_tl.o: console.c
-	$(CC)  -g3 $(INCLUDES) -D _TIME_T -D TLASER  -nostdinc++ -o console_tl.o -c console.c
+	$(CC)  -g3 $(CFLAGS) -D _TIME_T -D TLASER  -o $@ -c $< 
 
 printf.o: printf.c 
-	$(CC)  -g3 $(INCLUDES) -nostdinc++ -o $*.o -c $*.c
-
-paljtokern.s.o: paljtokern.s
-	g++ -I ../h -E -P -nostdinc -nostdinc++ -x c++ paljtokern.s | \
-	$(AS) -m 21164 -o paljtokern.s.o
-
-paljtoslave.s.o: paljtoslave.s
-	g++ -I ../h -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \
-	$(AS) -m 21164 -o paljtoslave.s.o
+	$(CC)  -g3 $(CFLAGS) -o $@ -c $<
 
-console_ts: console_ts.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o 
-	$(LD) -o console_ts  -N -Ttext $(DBMENTRY) -non_shared \
-	dbmentry.s.o console_ts.o printf.o paljtokern.s.o paljtoslave.s.o -lc
+console_ts: $(TSOBJS)
+	$(LD) -o console_ts  -N -Ttext $(DBMENTRY) -non_shared $(TSOBJS) -lc
 
-console_tl: console_tl.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o 
-	$(LD) -o console_tl  -N -Ttext $(DBMENTRY) -non_shared \
-	dbmentry.s.o console_tl.o printf.o paljtokern.s.o paljtoslave.s.o -lc
+console_tl: $(TLOBJS)
+	$(LD) -o console_tl  -N -Ttext $(DBMENTRY) -non_shared $(TLOBJS) -lc
 
 install: console
 	scp console zizzer.eecs.umich.edu:/z/m5/system/testing/binaries/console
 
 clean:
-	rm -f *.o console *.strip paljtokern.c paljtoslave.c
+	rm -f *.o console_t?