Address comments about makefiles and cmdl options

Cleans up the whitespaces and explicates the symbols option.

Also force building memory-analyzer on Linux and test it there by
default (unless explicitly unset). Behaviour on other platforms should be
preserved.

Author: petr-bauch

CMakeLists.txt

@@ -121,6 +121,15 @@ endfunction()
 option(WITH_MEMORY_ANALYZER OFF
   "build the memory analyzer")
 
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+set(WITH_MEMORY_ANALYZER_DEFAULT ON)
+else()
+set(WITH_MEMORY_ANALYZER_DEFAULT OFF)
+endif()
+
+option(WITH_MEMORY_ANALYZER ${WITH_MEMORY_ANALYZER_DEFAULT}
+  "build the memory analyzer")
+
 add_subdirectory(src)
 add_subdirectory(regression)
 add_subdirectory(unit)

regression/Makefile

@@ -30,6 +30,19 @@ DIRS = cbmc \
        symtab2gb \
        # Empty last line
 
+ifeq ($(OS),Windows_NT)
+    detected_OS := Windows
+else
+    detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
+endif
+
+ifeq ($(detected_OS),Linux)
+  ifneq ($(WITH_MEMORY_ANALYZER),0)
+    # only set if it wasn't explicitly unset
+    WITH_MEMORY_ANALYZER=1
+  endif
+endif
+
 ifeq ($(WITH_MEMORY_ANALYZER),1)
   DIRS += memory-analyzer
 endif

src/CMakeLists.txt

@@ -106,6 +106,6 @@ add_subdirectory(goto-diff)
 add_subdirectory(goto-harness)
 add_subdirectory(symtab2gb)
 
-if(WITH_MEMORY_ANALYZER)
+if(UNIX OR WITH_MEMORY_ANALYZER)
 add_subdirectory(memory-analyzer)
 endif()

src/Makefile

@@ -31,10 +31,21 @@ all: cbmc.dir \
      goto-diff.dir \
      goto-instrument.dir \
      goto-harness.dir \
-     memory-analyzer.dir \
      symtab2gb.dir \
      # Empty last line
 
+ifeq ($(OS),Windows_NT)
+  detected_OS := Windows
+else
+  detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
+endif
+
+ifeq ($(detected_OS),Linux)
+  all: memory-analyzer.dir
+else ifeq ($(WITH_MEMORY_ANALYZER),1)
+  all: memory-analyzer.dir
+endif
+
 ###############################################################################
 
 util.dir: big-int.dir

src/memory-analyzer/Makefile

@@ -1,22 +1,22 @@
-SRC = analyze_symbol.cpp\
-			gdb_api.cpp \
-			memory_analyzer_main.cpp \
-			memory_analyzer_parse_options.cpp
-      # Empty last line
+SRC = \
+  analyze_symbol.cpp \
+  gdb_api.cpp \
+  memory_analyzer_main.cpp \
+  memory_analyzer_parse_options.cpp
+  # Empty last line
 
 INCLUDES= -I ..
 
 LIBS = \
-	../ansi-c/ansi-c$(LIBEXT) \
-	../goto-programs/goto-programs$(LIBEXT) \
-	../linking/linking$(LIBEXT) \
-	../util/util$(LIBEXT) \
-	../big-int/big-int$(LIBEXT) \
-	../langapi/langapi$(LIBEXT)
+  ../ansi-c/ansi-c$(LIBEXT) \
+  ../goto-programs/goto-programs$(LIBEXT) \
+  ../linking/linking$(LIBEXT) \
+  ../util/util$(LIBEXT) \
+  ../big-int/big-int$(LIBEXT) \
+  ../langapi/langapi$(LIBEXT)
 
-	
 
-CLEANFILES = memory-analyzer$(EXEEXT) 
+CLEANFILES = memory-analyzer$(EXEEXT)
 
 include ../config.inc
 include ../common

unit/Makefile

@@ -84,6 +84,19 @@ SRC += analyses/ai/ai.cpp \
        util/unicode.cpp \
        # Empty last line
 
+ifeq ($(OS),Windows_NT)
+    detected_OS := Windows
+else
+    detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
+endif
+
+ifeq ($(detected_OS),Linux)
+  ifneq ($(WITH_MEMORY_ANALYZER),0)
+    # only set if it wasn't explicitly unset
+    WITH_MEMORY_ANALYZER=1
+  endif
+endif
+
 ifeq ($(WITH_MEMORY_ANALYZER),1)
   SRC += memory-analyzer/gdb_api.cpp
 endif