1 files changed, 21 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 55207f6..fc9e1e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,32 @@
-CFLAGS=-O0
+CFLAGS=-O0 -Wall
+
+NAME=CleanC
+OBJ=$(NAME).o
+INTERMEDIATE=interface.o cleanstring.o hacking.o
+TEST_SCRIPT=test
 
 CLM=clm
-CLMFLAGS=-ns -no-opt-link -l cleanc.o -l /usr/lib/x86_64-linux-gnu/libelf.so.1
+CLMFLAGS=-ns -no-opt-link -l $(OBJ) -l -lelf -l -lffi -I "$$CLEAN_HOME/lib/Generics"
+
+all: $(NAME).o
 
-all: cleanc.o
+$(OBJ): $(INTERMEDIATE)
+	$(LD) -r $^ -o $@
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-test: test.icl cleanc.icl cleanc.dcl cleanc.o
-	$(CLM) $(CLMFLAGS) test -o test
-
 clean:
 	rm -frv *.o test Clean\ System\ Files
 
-.PHONY: all clean
+clean_intermediate:
+	rm -frv $(INTERMEDIATE)
+
+$(TEST_SCRIPT): $(TEST_SCRIPT).icl $(NAME).icl $(NAME).dcl $(OBJ) $(TEST_SCRIPT).o
+	$(CLM) $(CLMFLAGS) -l $(TEST_SCRIPT).o $(TEST_SCRIPT) -o $(TEST_SCRIPT)
+
+run_test: $(TEST_SCRIPT)
+	./$(TEST_SCRIPT) -nt
+
+.PHONY: all clean clean_intermediate run_test