Merge branch 'master' into test-suite

Conflicts:
	Makefile

diff --combined Makefile
index dca380612a3d92c036442d6775dcd66746e3498a,c17e7b4689a025f7a5f3234fc5cb26a0ce16fb82..c261b4e687b41aaeac5b757df03d4b54b3912eff
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -25,8 -25,6 +25,8 @@@ OBJ     = 
            ast.o       \
            ir.o        \
            con.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
  
@@@ -38,22 -36,20 +38,26 @@@ default: gmqc
  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 target is test and all
 +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
+ parser.o: ast.h lexer.h
+ ast.o: ast.h ir.h
+ ir.o: ir.h