Merge branch 'master' into test-suite

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index ad8c9411c7467b647c7e3ad2cb14de64bf07e0ff..aa5ef11f11b60b2f9955c596c60b522e78c4dde4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,17 +23,19 @@ ifeq ($(track), no)
     CFLAGS += -DNOTRACK
 endif
 
-OBJ     = \
+OBJ     =             \
           util.o      \
           code.o      \
           ast.o       \
           ir.o        \
           con.o       \
           ftepp.o
+
+OBJ_T = test.o util.o con.o
 OBJ_C = main.o lexer.o parser.o
 OBJ_X = exec-standalone.o util.o con.o
 
-#default is compiler only
+
 default: gmqcc
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
@@ -41,17 +43,23 @@ default: gmqcc
 exec-standalone.o: exec.c
        $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
 
-qcvm:     $(OBJ_X)
+qcvm: $(OBJ_X)
        $(CC) -o $@ $^ $(CFLAGS) -lm
 
-# compiler target
 gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 
-all: gmqcc qcvm
+test: $(OBJ_T)
+       $(CC) -o $@ $^ $(CFLAGS)
+       
+runtests:
+       ./test
+
+all: gmqcc qcvm test
 
 clean:
-       rm -f *.o gmqcc qcvm
+       rm -f *.o gmqcc qcvm test *.dat
+
 
 $(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
 main.o: lexer.h