Make OpenMP support a config option

Makefile

@@ -1,5 +1,3 @@
-# Supported: GCC, CLANG, ICC
-TAG ?= GCC
 
 #CONFIGURE BUILD SYSTEM
 TARGET	   = bwbench-$(TAG)
@@ -9,8 +7,8 @@ MAKE_DIR   = ./
 Q         ?= @
 
 #DO NOT EDIT BELOW
-include $(MAKE_DIR)/include_$(TAG).mk
 include $(MAKE_DIR)/config.mk
+include $(MAKE_DIR)/include_$(TAG).mk
 INCLUDES  += -I./src/includes
 
 VPATH     = $(SRC_DIR)

config.mk

@@ -1,3 +1,8 @@
+# Supported: GCC, CLANG, ICC
+TAG ?= GCC
+ENABLE_OPENMP = false
+
+#Feature options
 OPTIONS  =  -DSIZE=40000000ull
 OPTIONS +=  -DNTIMES=10
 OPTIONS +=  -DARRAY_ALIGNMENT=64

include_CLANG.mk

@@ -1,7 +1,10 @@
 CC  = clang
 LINKER = $(CC)
 
-OPENMP   = #-fopenmp
+ifeq ($(ENABLE_OPENMP),true)
+OPENMP   = -fopenmp
+endif
+
 CFLAGS   = -Ofast -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE

include_GCC.mk

@@ -1,9 +1,12 @@
 CC  = gcc
 LINKER = $(CC)
 
-OPENMP   = # -fopenmp
+ifeq ($(ENABLE_OPENMP),true)
-CFLAGS   = -Ofast -std=c11 -pthread $(OPENMP)
+OPENMP   = -fopenmp
+endif
+
+CFLAGS   = -Ofast -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
-LIBS     = -lpthread
+LIBS     =

include_ICC.mk

@@ -1,9 +1,12 @@
 CC  = icc
 LINKER = $(CC)
 
-OPENMP   = #-qopenmp
+ifeq ($(ENABLE_OPENMP),true)
-CFLAGS   = -Ofast -xhost -std=c11 -pthread $(OPENMP)
+OPENMP   = -qopenmp
+endif
+
+CFLAGS   = -Ofast -xhost -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
-LIBS     = -lpthread
+LIBS     =