diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2
new file mode 100644
index 0000000000000000000000000000000000000000..f158236942ce7a3883a793b4b94c33143bf26726
--- /dev/null
+++ b/wmake/rules/General/ADIOS2
@@ -0,0 +1,13 @@
+#-------------------------------*- makefile -*---------------------------------
+# ADIOS2 includes/libraries
+
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
+
+# Obtain prefix and library information via adios2-config
+ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)
+ADIOS_LIBS   := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs)
+
+ADIOS_INC    = -I${ADIOS_PREFIX}/include
+
+#------------------------------------------------------------------------------
diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c
index b743e3f68cb8b11a294c84d4b9c4334d093d3e39..36f40bc36402ec824abe58ea59d26f882dca26ef 100644
--- a/wmake/rules/linux64Clang/c
+++ b/wmake/rules/linux64Clang/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = clang -m64
 
diff --git a/wmake/rules/linux64Clang/c++Debug b/wmake/rules/linux64Clang/c++Debug
index 1c63335a3f175dc5d51a04af7c160c06853cebf4..48f0b6643e18406a22b768923aa876a312269ea1 100644
--- a/wmake/rules/linux64Clang/c++Debug
+++ b/wmake/rules/linux64Clang/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -g -DFULLDEBUG
+c++DBUG     = -g -DFULLDEBUG
 c++OPT      = -O0
diff --git a/wmake/rules/linux64Cray/c b/wmake/rules/linux64Cray/c
index d08f44144037dd10701b5adfe4f357fc4c83054f..a3e304ed804fdb11e3ea73ab4177f33f128ce971 100644
--- a/wmake/rules/linux64Cray/c
+++ b/wmake/rules/linux64Cray/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = cc -m64
 
diff --git a/wmake/rules/linux64Cray/c++Debug b/wmake/rules/linux64Cray/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linux64Cray/c++Debug
+++ b/wmake/rules/linux64Cray/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c
index 1097b3a594ca9284537cc5af2b8248bb8bac4486..56b9e8ff72a582d8ef75649d772362f2c5200bca 100644
--- a/wmake/rules/linux64Gcc/c
+++ b/wmake/rules/linux64Gcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc -m64
 
diff --git a/wmake/rules/linux64Gcc/c++Debug b/wmake/rules/linux64Gcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linux64Gcc/c++Debug
+++ b/wmake/rules/linux64Gcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64GccKNL/c b/wmake/rules/linux64GccKNL/c
index d0eb3eab5709d94f814ba8f71aba33eab0757700..db0bbc58f915e631763905f588975649a21bbc56 100644
--- a/wmake/rules/linux64GccKNL/c
+++ b/wmake/rules/linux64GccKNL/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc -m64 -march=knl
 
diff --git a/wmake/rules/linux64GccKNL/c++Debug b/wmake/rules/linux64GccKNL/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linux64GccKNL/c++Debug
+++ b/wmake/rules/linux64GccKNL/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c
index 14a3a231d549dd4902dc5360f4566e0b8d14aa87..c405b37e24e12fb6bcc44dc0d5004ba1427f2c5e 100644
--- a/wmake/rules/linux64Icc/c
+++ b/wmake/rules/linux64Icc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        =
+cWARN       =
 
 cc          = icc
 
diff --git a/wmake/rules/linux64IccKNL/c b/wmake/rules/linux64IccKNL/c
index 14a3a231d549dd4902dc5360f4566e0b8d14aa87..c405b37e24e12fb6bcc44dc0d5004ba1427f2c5e 100644
--- a/wmake/rules/linux64IccKNL/c
+++ b/wmake/rules/linux64IccKNL/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        =
+cWARN       =
 
 cc          = icc
 
diff --git a/wmake/rules/linuxARM64Clang/c b/wmake/rules/linuxARM64Clang/c
new file mode 100644
index 0000000000000000000000000000000000000000..7a1e43e3779042cd6c3b66b0e7276ca84a0a7124
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/c
@@ -0,0 +1,17 @@
+SUFFIXES += .c
+
+cWARN       = -Wall
+
+## cc          = clang -m64
+cc          = clang
+
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxARM64Clang/c++ b/wmake/rules/linuxARM64Clang/c++
new file mode 100644
index 0000000000000000000000000000000000000000..2bf2892754a3b0666b5292de8dc04528801e084d
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/c++
@@ -0,0 +1,25 @@
+SUFFIXES += .C .cc .cpp .cxx
+
+c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-undefined-var-template
+
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
+
+## CC          = clang++ -std=c++11 -m64
+CC          = clang++ -std=c++11
+
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
diff --git a/wmake/rules/linuxARM64Clang/c++Debug b/wmake/rules/linuxARM64Clang/c++Debug
new file mode 100644
index 0000000000000000000000000000000000000000..48f0b6643e18406a22b768923aa876a312269ea1
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG     = -g -DFULLDEBUG
+c++OPT      = -O0
diff --git a/wmake/rules/linuxARM64Clang/c++Opt b/wmake/rules/linuxARM64Clang/c++Opt
new file mode 100644
index 0000000000000000000000000000000000000000..2aedabd6280a3476bc58db13139a0a3aa579502b
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linuxARM64Clang/c++Prof b/wmake/rules/linuxARM64Clang/c++Prof
new file mode 100644
index 0000000000000000000000000000000000000000..3bda4dad55e898a8198f6e8bfe21e8d829d7230a
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxARM64Clang/cDebug b/wmake/rules/linuxARM64Clang/cDebug
new file mode 100644
index 0000000000000000000000000000000000000000..7b7adf10deade9c64833672b98de8ace4fb61a0e
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -g -DFULLDEBUG
+cOPT        = -O0
diff --git a/wmake/rules/linuxARM64Clang/cOpt b/wmake/rules/linuxARM64Clang/cOpt
new file mode 100644
index 0000000000000000000000000000000000000000..17318709f1fa39e6bf89cbe87778bc6fa459de17
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linuxARM64Clang/cProf b/wmake/rules/linuxARM64Clang/cProf
new file mode 100644
index 0000000000000000000000000000000000000000..ca3ac9bf5f0cd61fe99e0f05fa1bd4bdf9fa6cf7
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxARM64Clang/general b/wmake/rules/linuxARM64Clang/general
new file mode 100644
index 0000000000000000000000000000000000000000..d83a18b000b3bb3e663ccee8efa77439d863c39d
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/general
@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(DEFAULT_RULES)/openmp
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxARM64Clang/openmp b/wmake/rules/linuxARM64Clang/openmp
new file mode 100644
index 0000000000000000000000000000000000000000..bcb805f57c6240bc577b1f04208ac09706d0846a
--- /dev/null
+++ b/wmake/rules/linuxARM64Clang/openmp
@@ -0,0 +1,4 @@
+# Flags for compiling/linking openmp
+
+COMP_OPENMP = -DUSE_OMP -fopenmp
+LINK_OPENMP = -lgomp
diff --git a/wmake/rules/linuxARM64Gcc/c b/wmake/rules/linuxARM64Gcc/c
new file mode 100644
index 0000000000000000000000000000000000000000..3ee7538cbb1808ebc79ed2f5dfa61e82354c8024
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/c
@@ -0,0 +1,16 @@
+SUFFIXES += .c
+
+cWARN       = -Wall
+
+cc          = gcc
+
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxARM64Gcc/c++ b/wmake/rules/linuxARM64Gcc/c++
new file mode 100644
index 0000000000000000000000000000000000000000..3985f54a9be5b7b40efcf55194780fefbf7a33f8
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/c++
@@ -0,0 +1,25 @@
+SUFFIXES += .C .cc .cpp .cxx
+
+c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
+              -Wno-invalid-offsetof -Wno-attributes
+
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
+CC          = g++ -std=c++11
+
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
diff --git a/wmake/rules/linuxARM64Gcc/c++Debug b/wmake/rules/linuxARM64Gcc/c++Debug
new file mode 100644
index 0000000000000000000000000000000000000000..08680a0e4aa011a94ce3318e5c869f3db9de286d
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG     = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxARM64Gcc/c++Opt b/wmake/rules/linuxARM64Gcc/c++Opt
new file mode 100644
index 0000000000000000000000000000000000000000..2e3e8c3bb197f54f6dd30cf18da6e656878dd3da
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/c++Opt
@@ -0,0 +1,4 @@
+c++DBUG     =
+c++OPT      = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps
+
+ROUNDING_MATH = -frounding-math
diff --git a/wmake/rules/linuxARM64Gcc/c++Prof b/wmake/rules/linuxARM64Gcc/c++Prof
new file mode 100644
index 0000000000000000000000000000000000000000..858dde1ed2354f0aa37db6bb53f7950b4e7af7a9
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG     = -pg
+c++OPT      = -O2
diff --git a/wmake/rules/linuxARM64Gcc/cDebug b/wmake/rules/linuxARM64Gcc/cDebug
new file mode 100644
index 0000000000000000000000000000000000000000..72b638f458220e329d52b59e3566a3c807101f9d
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxARM64Gcc/cOpt b/wmake/rules/linuxARM64Gcc/cOpt
new file mode 100644
index 0000000000000000000000000000000000000000..643c990ebda63b7dfb8134f76d7fa7f3f4a7add9
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps
diff --git a/wmake/rules/linuxARM64Gcc/cProf b/wmake/rules/linuxARM64Gcc/cProf
new file mode 100644
index 0000000000000000000000000000000000000000..ca3ac9bf5f0cd61fe99e0f05fa1bd4bdf9fa6cf7
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxARM64Gcc/general b/wmake/rules/linuxARM64Gcc/general
new file mode 100644
index 0000000000000000000000000000000000000000..86f567e61d83637e3688f49bd486ed0a31495802
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/general
@@ -0,0 +1,10 @@
+CPP         = cpp -traditional-cpp $(GFLAGS)
+LD          = ld
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(DEFAULT_RULES)/openmp
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/linuxARM64Gcc/openmp b/wmake/rules/linuxARM64Gcc/openmp
new file mode 100644
index 0000000000000000000000000000000000000000..bcb805f57c6240bc577b1f04208ac09706d0846a
--- /dev/null
+++ b/wmake/rules/linuxARM64Gcc/openmp
@@ -0,0 +1,4 @@
+# Flags for compiling/linking openmp
+
+COMP_OPENMP = -DUSE_OMP -fopenmp
+LINK_OPENMP = -lgomp
diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c
index dfae4adda0547faeae8333ed5e2660a3bacd7be7..3ee7538cbb1808ebc79ed2f5dfa61e82354c8024 100644
--- a/wmake/rules/linuxARM7Gcc/c
+++ b/wmake/rules/linuxARM7Gcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc
 
diff --git a/wmake/rules/linuxARM7Gcc/c++Debug b/wmake/rules/linuxARM7Gcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linuxARM7Gcc/c++Debug
+++ b/wmake/rules/linuxARM7Gcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt
index 4b21a7609dc47b8416a7f007fa59b5825acb4f09..fe7b457de7b83c21a980701a223eb319e4ca3112 100644
--- a/wmake/rules/linuxARM7Gcc/c++Opt
+++ b/wmake/rules/linuxARM7Gcc/c++Opt
@@ -1,5 +1,5 @@
 c++DBUG     =
-#c++OPT      = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
+#c++OPT     = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
 c++OPT      = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp
 
 ROUNDING_MATH = -frounding-math
diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt
index 0ee3f66355fb70a364604d1bc8794d319f7700fd..c80aa2b5c137b05847b4cb684b3bf4c70cb68550 100644
--- a/wmake/rules/linuxARM7Gcc/cOpt
+++ b/wmake/rules/linuxARM7Gcc/cOpt
@@ -1,3 +1,3 @@
 cDBUG       =
-#cOPT        = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
+#cOPT       = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
 cOPT        = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp
diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c
index 2c8e8a7f9c2dfae3ebf21b0e71bdd30e5b8458dc..59cf476f0ee15861fe244bb18a647bf67b3fc03f 100644
--- a/wmake/rules/linuxClang/c
+++ b/wmake/rules/linuxClang/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = clang -m32
 
diff --git a/wmake/rules/linuxClang/c++Debug b/wmake/rules/linuxClang/c++Debug
index 1c63335a3f175dc5d51a04af7c160c06853cebf4..48f0b6643e18406a22b768923aa876a312269ea1 100644
--- a/wmake/rules/linuxClang/c++Debug
+++ b/wmake/rules/linuxClang/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -g -DFULLDEBUG
+c++DBUG     = -g -DFULLDEBUG
 c++OPT      = -O0
diff --git a/wmake/rules/linuxGcc/c b/wmake/rules/linuxGcc/c
index 8eddde0490ddf8ce5858efefc26278625b87d217..5450517cee44c2932a8e7b6ac5fae25a43f37c1e 100644
--- a/wmake/rules/linuxGcc/c
+++ b/wmake/rules/linuxGcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc -m32
 
diff --git a/wmake/rules/linuxGcc/c++Debug b/wmake/rules/linuxGcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linuxGcc/c++Debug
+++ b/wmake/rules/linuxGcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxIA64Gcc/c b/wmake/rules/linuxIA64Gcc/c
index dfae4adda0547faeae8333ed5e2660a3bacd7be7..3ee7538cbb1808ebc79ed2f5dfa61e82354c8024 100644
--- a/wmake/rules/linuxIA64Gcc/c
+++ b/wmake/rules/linuxIA64Gcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc
 
diff --git a/wmake/rules/linuxIA64Gcc/c++Debug b/wmake/rules/linuxIA64Gcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linuxIA64Gcc/c++Debug
+++ b/wmake/rules/linuxIA64Gcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c
index 2b19596b1a05d2f80010512e60b8941915752fe1..2d8cda5910817d3311d5e1fd8440a926d6f99772 100644
--- a/wmake/rules/linuxIA64Icc/c
+++ b/wmake/rules/linuxIA64Icc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        =
+cWARN       =
 
 cc          = icc
 
diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c
index c9f75c90217057b1d520a7e7b66681b18862421f..e3c578ae159d78bdf1ea1ccf0fa1d3ad23126017 100644
--- a/wmake/rules/linuxIcc/c
+++ b/wmake/rules/linuxIcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        =
+cWARN       =
 
 cc          = icc -gcc-version=400
 
diff --git a/wmake/rules/linuxPPC64Gcc/c b/wmake/rules/linuxPPC64Gcc/c
index f973417062ea07758ca2d147fdd4f43c708866ab..dce6cc7466d3db282227acf5b7536bcc51e25c43 100644
--- a/wmake/rules/linuxPPC64Gcc/c
+++ b/wmake/rules/linuxPPC64Gcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc -m64 -mcpu=power5+
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++Debug b/wmake/rules/linuxPPC64Gcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linuxPPC64Gcc/c++Debug
+++ b/wmake/rules/linuxPPC64Gcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxPPC64leGcc/c b/wmake/rules/linuxPPC64leGcc/c
index c5e3c73ebab1b532aa85bc50aac9bb1b56c68a4e..ec88f476277ecf29be4d96041334b46727771a93 100644
--- a/wmake/rules/linuxPPC64leGcc/c
+++ b/wmake/rules/linuxPPC64leGcc/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cWARN        = -Wall
+cWARN       = -Wall
 
 cc          = gcc -m64 -mcpu=power8
 
diff --git a/wmake/rules/linuxPPC64leGcc/c++Debug b/wmake/rules/linuxPPC64leGcc/c++Debug
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..08680a0e4aa011a94ce3318e5c869f3db9de286d 100644
--- a/wmake/rules/linuxPPC64leGcc/c++Debug
+++ b/wmake/rules/linuxPPC64leGcc/c++Debug
@@ -1,2 +1,2 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
+c++DBUG     = -ggdb3 -DFULLDEBUG
 c++OPT      = -O0 -fdefault-inline