X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=benchmarks.mk;h=4f0031f6b79ad79919a746b4d67c788fa3da5827;hb=cec79cfe07dea7f730f0f0c928a34689f2119809;hp=0d53e5d4ac92721022657b6e1a02a4de32d37e25;hpb=f0bcfda022d67bdae85948061e9196431878e49b;p=model-checker-benchmarks.git

diff --git a/benchmarks.mk b/benchmarks.mk
index 0d53e5d..4f0031f 100644
--- a/benchmarks.mk
+++ b/benchmarks.mk
@@ -8,17 +8,27 @@ UNAME = $(shell uname)
 LIB_NAME = model
 LIB_SO = lib$(LIB_NAME).so
 
-BASE = ../..
+#BASE = ../..
+BASE = $(CDS_DIR)
 INCLUDE = -I$(BASE)/include -I../include
-FLAGS := -g -rdynamic
-CPPFLAGS += $(INCLUDE) $(FLAGS)
-CFLAGS += $(INCLUDE) $(FLAGS)
-LDFLAGS += -L$(BASE) -l$(LIB_NAME)
+
+# C preprocessor flags
+CPPFLAGS += $(INCLUDE) -g
+
+# C++ compiler flags
+CXXFLAGS += $(CPPFLAGS)
+
+# C compiler flags
+CFLAGS += $(CPPFLAGS)
+
+# Linker flags
+LDFLAGS += -L$(BASE) -l$(LIB_NAME) -rdynamic
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
 MACFLAGS = -D_XOPEN_SOURCE -DMAC
 CPPFLAGS += $(MACFLAGS)
+CXXFLAGS += $(MACFLAGS)
 CFLAGS += $(MACFLAGS)
 LDFLAGS += $(MACFLAGS)
 endif