fix compile

[c11concurrency-benchmarks.git] / silo / Makefile

diff --git a/silo/Makefile b/silo/Makefile
index 682b4cb119be87cd1dea1ae7d76c2b332704104c..0c0f04fd2693ae31591f65b78d5aad2afb983ec8 100644 (file)
--- a/silo/Makefile
+++ b/silo/Makefile
@@ -75,7 +75,7 @@ else
        $(error invalid mode)
 endif
 
-CXXFLAGS := -g -Wall -std=c++0x
+CXXFLAGS := -g -std=c++0x
 CXXFLAGS += -MD -Ithird-party/lz4 -DCONFIG_H=\"$(CONFIG_H)\"
 ifeq ($(DEBUG_S),1)
         CXXFLAGS += -fno-omit-frame-pointer -DDEBUG
@@ -249,13 +249,13 @@ ifneq ($(DEPFILES),)
 -include $(DEPFILES)
 endif
 
-ifeq ($(wildcard masstree/GNUmakefile.in),)
-INSTALL_MASSTREE := $(shell git submodule init; git submodule update)
-endif
+#ifeq ($(wildcard masstree/GNUmakefile.in),)
+#INSTALL_MASSTREE := $(shell git submodule init; git submodule update)
+#endif
 
-ifeq ($(MASSTREE_S),1)
-UPDATE_MASSTREE := $(shell cd ./`git rev-parse --show-cdup` && cur=`git submodule status --cached masstree | head -c 41 | tail -c +2` && if test -z `cd masstree; git rev-list -n1 $$cur^..HEAD 2>/dev/null`; then (echo Updating masstree... 1>&2; cd masstree; git checkout -f master >/dev/null; git pull; cd ..; git submodule update masstree); fi)
-endif
+#ifeq ($(MASSTREE_S),1)
+#UPDATE_MASSTREE := $(shell cd ./`git rev-parse --show-cdup` && cur=`git submodule status --cached masstree | head -c 41 | tail -c +2` && if test -z `cd masstree; git rev-list -n1 $$cur^..HEAD 2>/dev/null`; then (echo Updating masstree... 1>&2; cd masstree; git checkout -f master >/dev/null; git pull; cd ..; git submodule update masstree); fi)
+#endif
 
 ifneq ($(strip $(DEBUG_S).$(CHECK_INVARIANTS_S).$(EVENT_COUNTERS_S)),$(strip $(DEP_MAIN_CONFIG)))
 DEP_MAIN_CONFIG := $(shell mkdir -p $(O); echo >$(O)/buildstamp; echo "DEP_MAIN_CONFIG:=$(DEBUG_S).$(CHECK_INVARIANTS_S).$(EVENT_COUNTERS_S)" >$(O)/_main_config.d)