Merge branch 'master' into test-suite

Conflicts:
	Makefile

diff --cc Makefile
index dca380612a3d92c036442d6775dcd66746e3498a,c17e7b4689a025f7a5f3234fc5cb26a0ce16fb82..c261b4e687b41aaeac5b757df03d4b54b3912eff
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -44,16 -42,14 +44,20 @@@ qcvm: $(OBJ_X
  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