emul: rename stage2 to stage

emul/.gitignore

@@ -1,7 +1,4 @@
-/stage1
-/stage1dbg
-/stage2
+/stage
 /forth
 /*-bin.h
-/stage0.bin
 /blkfs

emul/Makefile

@@ -1,4 +1,4 @@
-TARGETS = forth stage2
+TARGETS = forth stage
 OBJS = emul.o libz80/libz80.o
 BIN2C = ../tools/bin2c
 BLKPACK = ../tools/blkpack
@@ -18,7 +18,7 @@ $(BLKUNPACK): $(BLKPACK)
 forth-bin.h: $(BIN2C)
 	$(BIN2C) KERNEL < forth.bin > $@
 
-stage2: stage.c $(OBJS) forth-bin.h blkfs-bin.h
+stage: stage.c $(OBJS) forth-bin.h blkfs-bin.h
 	$(CC) stage.c $(OBJS) -o $@
 
 blkfs: $(BLKPACK)
@@ -39,8 +39,8 @@ emul.o: emul.c
 
 
 .PHONY: updatebootstrap
-updatebootstrap: stage2 xcomp.fs
-	./stage2 < xcomp.fs > forth.bin
+updatebootstrap: stage xcomp.fs
+	./stage < xcomp.fs > forth.bin
 
 .PHONY: pack
 pack:

recipes/rc2014/Makefile

@@ -2,13 +2,13 @@ TARGET = stage1.bin
 BASEDIR = ../..
 FDIR = $(BASEDIR)/forth
 EDIR = $(BASEDIR)/emul
-STAGE2 = $(EDIR)/stage2
+STAGE = $(EDIR)/stage
 EMUL = $(BASEDIR)/emul/hw/rc2014/classic
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE2)
-	cat xcomp.fs | $(STAGE2) > $@
+$(TARGET): xcomp.fs $(STAGE)
+	cat xcomp.fs | $(STAGE) > $@
 
 $(SLATEST):
 	$(MAKE) -C $(BASEDIR)/tools

recipes/ti84/Makefile

@@ -2,14 +2,14 @@ TARGET = stage1.bin
 BASEDIR = ../..
 FDIR = $(BASEDIR)/forth
 EDIR = $(BASEDIR)/emul
-STAGE2 = $(EDIR)/stage2
+STAGE = $(EDIR)/stage
 EMUL = $(BASEDIR)/emul/hw/ti/ti84
 MKTIUPGRADE = mktiupgrade
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE2)
-	cat xcomp.fs | $(STAGE2) > $@
+$(TARGET): xcomp.fs $(STAGE)
+	cat xcomp.fs | $(STAGE) > $@
 
 $(EMUL):
 	$(MAKE) -C ${@:%/ti84=%}

recipes/trs80/Makefile

@@ -1,8 +1,8 @@
 TARGET = stage1.bin
 EDIR = ../../emul
-STAGE2 = $(EDIR)/stage2
+STAGE = $(EDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE2)
-	cat xcomp.fs | $(STAGE2) > $@
+$(TARGET): xcomp.fs $(STAGE)
+	cat xcomp.fs | $(STAGE) > $@