Do not run make clean automatically on every build and other Makefile changes

4 files changed, 23 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index 2e79f0a..71c8d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ test/last.*
 tools/results
 .vscode
 *.o
+*.so
 *.s
diff --git a/Makefile b/Makefile
index 5c655b7..4744458 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,39 @@
 include config.mk
 
-all: cube.o debugcube.o
+all: nissy.o
 
-cube.s: clean
-        ${CC} ${MACROS} ${CFLAGS} -c -S -o cube.s src/nissy.c
+nissy.s:
+        ${CC} ${MACROS} ${CFLAGS} -c -S -o nissy.s src/nissy.c
 
-cube.o: clean
-        ${CC} ${MACROS} ${CFLAGS} -c -o cube.o src/nissy.c
+nissy.o:
+        ${CC} ${MACROS} ${CFLAGS} -c -o nissy.o src/nissy.c
 
-debugcube.o: clean
-        ${CC} ${MACROS} ${DBGFLAGS} -c -o debugcube.o src/nissy.c
+nissy.so:
+        ${CC} ${MACROS} ${CFLAGS} -c -shared -o nissy.so src/nissy.c
+
+debugnissy.o:
+        ${CC} ${MACROS} ${DBGFLAGS} -c -o debugnissy.o src/nissy.c
 
 clean:
         rm -rf *.o run
 
-test: debugcube.o
-        CC="${CC} ${MACROS} ${DBGFLAGS}" ./test/test.sh
+test: debugnissy.o
+        CC="${CC} ${MACROS} ${DBGFLAGS}" OBJ=debugnissy.o ./test/test.sh
 
-tool: cube.o
+tool: nissy.o
         mkdir -p tools/results
-        CC="${CC} ${MACROS} ${CFLAGS}" CUBEOBJ=cube.o ./tools/run_tool.sh
+        CC="${CC} ${MACROS} ${CFLAGS}" OBJ=nissy.o ./tools/tool.sh
 
-debugtool: debugcube.o
+debugtool: debugnissy.o
         mkdir -p tools/results
-        CC="${CC} ${MACROS} ${DBGFLAGS}" CUBEOBJ=debugcube.o ./tools/run_tool.sh
+        CC="${CC} ${MACROS} ${DBGFLAGS}" OBJ=debugnissy.o ./tools/tool.sh
 
-shell: cube.o
+shell: nissy.o
         mkdir -p tables
-        ${CC} ${MACROS} ${CFLAGS} -o run cube.o shell.c
+        ${CC} ${MACROS} ${CFLAGS} -o run nissy.o shell.c
 
-debugshell: debugcube.o
+debugshell: debugnissy.o
         mkdir -p tables
-        ${CC} ${MACROS} ${DBGFLAGS} -o run debugcube.o shell.c
+        ${CC} ${MACROS} ${DBGFLAGS} -o run debugnissy.o shell.c
 
 .PHONY: all clean test tool debugtool shell debugshell
diff --git a/test/test.sh b/test/test.sh
index 14b4ca3..a675286 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -5,7 +5,6 @@ re="${TEST:-$@}"
 TESTBIN="test/run"
 TESTOUT="test/last.out"
 TESTERR="test/last.err"
-CUBEOBJ="debugcube.o"
 
 for t in test/*; do
         if [ -n "$re" ] && !(echo "$t" | grep -q "$re"); then
@@ -14,7 +13,7 @@ for t in test/*; do
         
         # Verify if $t is a directory and if its name starts with three digits
         if [ -d "$t" ] && basename "$t" | grep -Eq '^[0-9]{3}'; then
-                $CC -o $TESTBIN "$t"/*.c $CUBEOBJ || exit 1
+                $CC -o $TESTBIN "$t"/*.c $OBJ || exit 1
                 for cin in "$t"/*.in; do
                         c=$(echo "$cin" | sed 's/\.in//')
                         cout="$c.out"
@@ -32,4 +31,3 @@ for t in test/*; do
 done
 
 echo "All tests passed!"
-rm -rf $TESTBIN $TESTOUT $TESTERR $CUBEOBJ
diff --git a/tools/run_tool.sh b/tools/tool.sh
index 2216a66..64bfd89 100755
--- a/tools/run_tool.sh
+++ b/tools/tool.sh
@@ -15,11 +15,8 @@ for t in tools/*; do
                 continue
         fi
         toolname="$(basename "$t" .c)"
-        $CC -o $BIN "$t"/*.c "$CUBEOBJ" || exit 1;
+        $CC -o $BIN "$t"/*.c "$OBJ" || exit 1;
         $BIN $TOOLARGS \
                 | tee "tools/results/$toolname-$d.txt" "tools/results/last.out"
         break
 done
-
-# $BIN is kept so it can be run manually for profiling
-rm -rf "$CUBEOBJ"