Add models lib to Makefiles

make in repo root now builds the models lib.

Author: smowton

Makefile

@@ -1,7 +1,11 @@
 .PHONY: all clean setup-cbmc regression
 
+CPROVER_DIR ?= cbmc/src
+export CPROVER_DIR
+
 all:
 	$(MAKE) $(MAKEARGS) -C src
+	$(MAKE) $(MAKEARGS) -C benchmarks/LIBRARIES/models/plug
 
 clean:
 	$(MAKE) $(MAKEARGS) -C cbmc/src clean
@@ -18,4 +22,3 @@ ifndef single
 else
 	python ./benchmarks/evaluator.py -B $(single)
 endif
-

benchmarks/LIBRARIES/models/plug/Makefile

@@ -3,10 +3,10 @@ SRC = \
   java/lang/boolean.cpp \
   # Empty
 
-INCLUDES= -I . -I include -I ../../../src -I ../../../$(CPROVER_DIR)
+INCLUDES= -I . -I include -I ../../../src -I ../../../../../$(CPROVER_DIR)
 
-include ../../../$(CPROVER_DIR)/config.inc
-include ../../../$(CPROVER_DIR)/common
+include ../../../../../$(CPROVER_DIR)/config.inc
+include ../../../../../$(CPROVER_DIR)/common
 
 CLEANFILES = models-library$(LIBEXT)