Updated makefile

diff --git a/.gitignore b/.gitignore
index ecb9b7842fdda09d41498cf0b567d01daf74dae5..f596bf3e5ff98266cf381d28add820bac882011a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,10 @@ compile_commands.json
 
 assets/
 *.pyc
+
+rg.gb
+rg.mlb
+rg.lst
+testrg.gb
+testrg.mlb
+testrg.lst

diff --git a/makefile b/makefile
index e61f576fe778b80482c48e0a72e8ae9d2b557078..74987712d3bbaa87a56a4d4e5336324d7ac1b8d8 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,14 +1,12 @@
+NAME=rg
+TEST_NAME=test$(NAME)
 AS=ulas 
-BIN=rg.gb
-BDIR=bin/
 
-all:
-       mkdir -p $(BDIR)
-       ulas -v -o $(BDIR)/$(BIN) -l bin/rg.lst -s bin/rg.mlb -S mlb -i ./src -i ./tiles src/main.s
+bin:
+       $(AS) -v -o $(NAME).gb -l ${NAME}.lst -s $(NAME).mlb -S mlb -i ./src -i ./tiles src/main.s
 
 test:
-       mkdir -p $(BDIR)
-       ulas -v -o $(BDIR)/test$(BIN) -D TEST_BUILD -l bin/testrg.lst -s bin/testrg.mlb -S mlb -i ./src -i ./tiles src/main.s
+       $(AS) -v -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb -i ./src -i ./tiles src/main.s
 
 .PHONY: tiles
 tiles: