Benchmarks can now build with system coz and includes. Fixes #26

Makefile

@@ -1,4 +1,4 @@
 ROOT := .
-DIRS := libcoz
+DIRS := libcoz benchmarks
 
 include $(ROOT)/common.mk

benchmarks/histogram/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := histogram
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/kmeans/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := kmeans
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/linear_regression/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := linear_regression
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/matrix_multiply/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := matrix_multiply
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include -Wno-format
+CFLAGS  := -g -O2 -Wno-format
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/pbzip2/Makefile

@@ -1,9 +1,13 @@
-ROOT 	   := ../..
+ROOT     := ../..
 TARGETS  := pbzip2
 LIBS     := bz2 pthread dl
-CXXFLAGS := -g -O2 -Wno-format -I$(ROOT)/include -Ibzip2-1.0.6
+CXXFLAGS := -g -O2 -Wno-format -Ibzip2-1.0.6
 LDFLAGS  := -Lbzip2-1.0.6
 
+ifeq ($(USE_SYSTEM_COZ),)
+CXXFLAGS += -I$(ROOT)/include
+endif
+
 BENCHMARK := 1
 
 include $(ROOT)/common.mk

benchmarks/pca/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := pca
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/producer_consumer/Makefile

@@ -1,7 +1,11 @@
-ROOT 	   := ../..
+ROOT     := ../..
 TARGETS  := producer_consumer
 LIBS     := dl pthread
-CXXFLAGS := -g -O2 -I$(ROOT)/include
+CXXFLAGS := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CXXFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/string_match/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := string_match
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 
@@ -19,4 +23,4 @@ string_match_datafiles/%:
 	@wget -c http://csl.stanford.edu/~christos/data/reverse_index.tar.gz
 	@echo $(LOG_PREFIX) Unpacking string_match inputs $(LOG_SUFFIX)
 	@tar xzf string_match.tar.gz
-	@rm string_match.tar.gz
+	@rm string_match.tar.gz

benchmarks/toy/Makefile

@@ -1,7 +1,11 @@
-ROOT 	   := ../..
+ROOT     := ../..
 TARGETS  := toy
 LIBS     := dl pthread
-CXXFLAGS := --std=c++11 -g -O2 -I$(ROOT)/include
+CXXFLAGS := --std=c++11 -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

benchmarks/word_count/Makefile

@@ -1,7 +1,11 @@
-ROOT 	  := ../..
+ROOT    := ../..
 TARGETS := word_count
 LIBS    := pthread dl
-CFLAGS  := -g -O2 -I$(ROOT)/include
+CFLAGS  := -g -O2
+
+ifeq ($(USE_SYSTEM_COZ),)
+CFLAGS += -I$(ROOT)/include
+endif
 
 BENCHMARK := 1
 

common.mk

@@ -2,8 +2,12 @@
 CC  := clang
 CXX := clang++
 
-# Use coz in development directory by default
-COZ ?= $(ROOT)/coz
+# Set coz and include path for coz
+ifeq ($(USE_SYSTEM_COZ),1)
+COZ = $(shell which coz)
+else
+COZ = $(ROOT)/coz
+endif
 
 # Default flags
 CFLAGS   ?= -g -O2