Bring the makefile and .gitignore up to line

cassiemeharry · Oct 21, 2012 · 11fc707 · 11fc707
1 parent 4f1d150
commit 11fc707
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 *.bin
+*.o
 *~
-combined.dasm
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
-all: combined.dasm
-	dtasm -o forth-core.bin combined.dasm
-combined.dasm: forth-macros.m4 forth-core.dasm
-	m4 forth-macros.m4 forth-core.dasm > combined.dasm
+all: forth-core.o
+	dtld -l image -o forth-core.bin forth-core.o
+forth-core.o: forth-core.dasm forth-macros.m4
+	m4 forth-core.dasm | dtasm -i -o forth-core.o -
 clean:
-	rm -rf *.bin combined.dasm
+	rm -rf *.bin *.o