Merge branch 'master' into test-suite

Conflicts:
	Makefile

diff --combined Makefile
index 582f0aaa7fdd2978bf9590a1b64d61888c9bae4e,5486dd13eaf68e5da1fca94b230d0fe904b8bc65..89168d76aa7fa5c8142e3924794d421bb11a46fd
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,3 -1,7 +1,7 @@@
+ DESTDIR :=
+ PREFIX := /usr/local
+ BINDIR := $(PREFIX)/bin
+ 
  CC     ?= clang
  CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
  #turn on tons of warnings if clang is present
@@@ -19,18 -23,16 +23,18 @@@ ifeq ($(track), no
      CFLAGS += -DNOTRACK
  endif
  
 -OBJ     = \
 +OBJ     =             \
            util.o      \
            code.o      \
            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
  
 -#default is compiler only
 +
  default: gmqcc
  %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
@@@ -38,25 -40,28 +42,34 @@@
  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
  parser.o: ast.h lexer.h
  ast.o: ast.h ir.h
  ir.o: ir.h
+ 
+ install: install-gmqcc install-qcvm
+ install-gmqcc: gmqcc
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/gmqcc
+ install-qcvm: qcvm
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  qcvm    $(DESTDIR)$(BINDIR)/qcvm