Directory cleanup.

hellige · May 15, 2012 · bc05fbc · bc05fbc
1 parent 78d0950
commit bc05fbc
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -46,14 +46,14 @@ $(MAIN_O):out/%.o: $(MAIN_DIR)/%.c
 colortest.img: colortest.dasm masm
 	./masm $< $@
 
-out/boot.img: goforth.dasm masm
+out/boot.img: forth/goforth.dasm masm
 	m4 $< > out/goforth.s
 	./masm out/goforth.s $@
 
-goforth.img: goforth.ft asm.ft disasm.ft out/boot.img dcpu
+goforth.img: forth/goforth.ft forth/asm.ft forth/disasm.ft out/boot.img dcpu
-	cat goforth.ft | ./dcpu -k 10000 out/boot.img > /dev/null
+	cat forth/goforth.ft | ./dcpu -k 10000 out/boot.img > /dev/null
-	cat asm.ft | ./dcpu -k 10000 core.img > /dev/null
+	cat forth/asm.ft | ./dcpu -k 10000 core.img > /dev/null
-	cat disasm.ft | ./dcpu -k 10000 core.img > /dev/null
+	cat forth/disasm.ft | ./dcpu -k 10000 core.img > /dev/null
 	mv core.img $@
 
 clean:
@@ -62,7 +62,7 @@ clean:
 	-rm -f out/goforth.s
 
 spotless: clean
-	-rm -f $(ALL_O:.o=.d)
+	-rm -rf out
 
 -include $(ALL_O:.o=.d)
 

diff --git a/font.bmp → emulator/font.bmp b/font.bmp → emulator/font.bmp
diff --git a/asm.ft → forth/asm.ft b/asm.ft → forth/asm.ft
diff --git a/disasm.ft → forth/disasm.ft b/disasm.ft → forth/disasm.ft
diff --git a/goforth.dasm → forth/goforth.dasm b/goforth.dasm → forth/goforth.dasm
diff --git a/goforth.ft → forth/goforth.ft b/goforth.ft → forth/goforth.ft
diff --git a/quine.dasm b/quine.dasm
diff --git a/swapend → scripts/swapend b/swapend → scripts/swapend
diff --git a/toasm → scripts/toasm b/toasm → scripts/toasm
diff --git a/tohex → scripts/tohex b/tohex → scripts/tohex