From a26febda1683d6ea853f2b510b645df42a93ab8d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 10 Aug 2009 23:53:56 +0000
Subject: [PATCH] 2009-08-11 01:52 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/bsd/gcc.cf   * config/wce/msvcarm.cf   *
 config/wce/mingwarm.cf   * config/wce/poccarm.cf   * config/hpux/gcc.cf   *
 config/darwin/gcc.cf   * config/dos/watcom.cf   * config/dos/djgpp.cf   *
 config/win/watcom.cf   * config/win/icc.cf   * config/win/cygwin.cf   *
 config/win/msvc.cf   * config/win/xcc.cf   * config/win/mingw.cf   *
 config/win/pocc.cf   * config/win/bcc.cf   * config/linux/watcom.cf   *
 config/linux/gcc.cf   * config/linux/icc.cf   * config/linux/sunpro.cf   *
 config/os2/watcom.cf   * config/os2/gcc.cf   * config/sunos/gcc.cf   *
 config/sunos/sunpro.cf     + Indentation.     * Minor cleanups (to GT
 dependency lib sections, deleted       check for hbrtl, it's enough to check
 for the gt name)

---
 harbour/ChangeLog              | 29 +++++++++++++++++++
 harbour/config/bsd/gcc.cf      | 40 +++++++++++---------------
 harbour/config/darwin/gcc.cf   | 38 ++++++++++---------------
 harbour/config/dos/djgpp.cf    |  6 ++--
 harbour/config/dos/watcom.cf   | 52 +++++++++++++++++-----------------
 harbour/config/hpux/gcc.cf     | 31 +++++++++-----------
 harbour/config/linux/gcc.cf    | 49 ++++++++++++++------------------
 harbour/config/linux/icc.cf    | 33 +++++++++------------
 harbour/config/linux/sunpro.cf | 25 +++++++---------
 harbour/config/linux/watcom.cf | 43 ++++++++++++++--------------
 harbour/config/os2/gcc.cf      | 37 ++++++++++++------------
 harbour/config/os2/watcom.cf   | 42 +++++++++++++--------------
 harbour/config/sunos/gcc.cf    | 31 +++++++++-----------
 harbour/config/sunos/sunpro.cf | 19 +++++--------
 harbour/config/wce/mingwarm.cf | 10 +++----
 harbour/config/wce/msvcarm.cf  | 28 +++++++++---------
 harbour/config/wce/poccarm.cf  | 10 +++----
 harbour/config/win/bcc.cf      | 12 ++++----
 harbour/config/win/cygwin.cf   |  8 +++---
 harbour/config/win/icc.cf      | 14 ++++-----
 harbour/config/win/mingw.cf    | 20 ++++++-------
 harbour/config/win/msvc.cf     | 24 ++++++++--------
 harbour/config/win/pocc.cf     | 10 +++----
 harbour/config/win/watcom.cf   | 44 ++++++++++++++--------------
 harbour/config/win/xcc.cf      |  8 +++---
 25 files changed, 322 insertions(+), 341 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 748dadd344..30fb7d4842 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,35 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-11 01:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/bsd/gcc.cf
+  * config/wce/msvcarm.cf
+  * config/wce/mingwarm.cf
+  * config/wce/poccarm.cf
+  * config/hpux/gcc.cf
+  * config/darwin/gcc.cf
+  * config/dos/watcom.cf
+  * config/dos/djgpp.cf
+  * config/win/watcom.cf
+  * config/win/icc.cf
+  * config/win/cygwin.cf
+  * config/win/msvc.cf
+  * config/win/xcc.cf
+  * config/win/mingw.cf
+  * config/win/pocc.cf
+  * config/win/bcc.cf
+  * config/linux/watcom.cf
+  * config/linux/gcc.cf
+  * config/linux/icc.cf
+  * config/linux/sunpro.cf
+  * config/os2/watcom.cf
+  * config/os2/gcc.cf
+  * config/sunos/gcc.cf
+  * config/sunos/sunpro.cf
+    + Indentation.
+    * Minor cleanups (to GT dependency lib sections, deleted
+      check for hbrtl, it's enough to check for the gt name)
+
 2009-08-11 01:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/wce/mingwarm.cf
   * config/win/msvc.cf
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 5781cc0bab..79459e1510 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -19,15 +19,15 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCACHE) $(HB_CMP)
@@ -38,46 +38,38 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
 ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
+   HB_CRS_LIB := ncurses
 endif
-
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
-
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
-# In BSD, slang still needs curses :(
-ifeq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   LINKLIBS += -lslang
+   # In BSD, slang still needs curses :(
+   ifeq ($(findstring gtcrs, $(LIBS)),)
+      LINKLIBS += -l$(HB_CRS_LIB)
+   endif
 endif
-endif
-
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 LINKPATHS += -L/usr/local/lib
 
-endif
-
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm
 
-LDFLAGS +=  $(LINKPATHS)
+LDFLAGS += $(LINKPATHS)
 
 AR := ar
 ARFLAGS = $(HB_USER_AFLAGS)
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index 1e2debcd35..146b06c4bb 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -29,15 +29,15 @@ CPPFLAGS += -no-cpp-precomp
 CFLAGS = -fno-common
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 # It's to avoid warning message generated when 'long double' is used
@@ -52,39 +52,31 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
 ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
+   HB_CRS_LIB := ncurses
 endif
-
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
-
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
-# In BSD, slang still needs curses :(
-ifeq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   LINKLIBS += -lslang
+   # In BSD, slang still needs curses :(
+   ifeq ($(findstring gtcrs, $(LIBS)),)
+      LINKLIBS += -l$(HB_CRS_LIB)
+   endif
 endif
-endif
-
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
-endif
-
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 5b72179dce..667c8b2f52 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -19,15 +19,15 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CMP)
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index a0c620219e..3f620ca2ce 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -16,14 +16,14 @@ LIB_PREF :=
 LIB_EXT := .lib
 
 ifeq ($(HB_BUILD_MODE),c)
-CC := wcc386
+   CC := wcc386
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CC := wpp386
+   CC := wpp386
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-CC := wpp386
+   CC := wpp386
 endif
 CC_IN :=
 CC_OUT := -fo=
@@ -31,42 +31,42 @@ CC_OUT := -fo=
 CPPFLAGS = -zq -bt=dos
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -w3
+   CPPFLAGS += -w3
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# architecture flags
-CPPFLAGS += -5r -fp5
+   # architecture flags
+   CPPFLAGS += -5r -fp5
 
-# optimization flags
-# don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-#CPPFLAGS += -obl+m
-ifeq ($(CC),wpp386)
-CPPFLAGS += -oi+
-else
-CPPFLAGS += -oi
-endif
+   # optimization flags
+   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
+   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CPPFLAGS += -obl+m
+   ifeq ($(CC),wpp386)
+      CPPFLAGS += -oi+
+   else
+      CPPFLAGS += -oi
+   endif
 endif
 
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -d2
+   CPPFLAGS += -d2
 endif
 
 ifeq ($(CC),wcc386)
-ifneq ($(HB_HOST_ARCH),linux)
-CPPFLAGS := $(subst /,\,$(CPPFLAGS))
-CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
-endif
+   ifneq ($(HB_HOST_ARCH),linux)
+      CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+      CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+   endif
 endif
 
 # work arround to DOS command line size limit
 ifeq ($(CC),wcc386)
-export WCC386 := $(strip $(CPPFLAGS))
+   export WCC386 := $(strip $(CPPFLAGS))
 else
-export WPP386 := $(strip $(CPPFLAGS))
+   export WPP386 := $(strip $(CPPFLAGS))
 endif
 CPPFLAGS =
 
@@ -93,13 +93,13 @@ endef
 LD := wlink
 # different SYS values: dos4g (default), pmodew (commercial), causeway
 ifeq ($(LIBNAME),hbpp)
-# we force causeway here as workaround for reduced command line size in dos4g
-LDFLAGS = SYS causeway
+   # we force causeway here as workaround for reduced command line size in dos4g
+   LDFLAGS = SYS causeway
 else
-LDFLAGS = SYS dos4g OP STUB=wstubq.exe
+   LDFLAGS = SYS dos4g OP STUB=wstubq.exe
 endif
 ifeq ($(HB_BUILD_DEBUG),yes)
-LDFLAGS := DEBUG ALL $(LDFLAGS)
+   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif
 
 LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 88eef122b7..53789ad54a 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -21,11 +21,11 @@ CFLAGS =
 LDFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 CFLAGS += -fPIC
@@ -35,7 +35,7 @@ CFLAGS += -fPIC
 #LDFLAGS = -mlp64
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCACHE) $(HB_CMP)
@@ -46,32 +46,27 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := ncurses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
-endif
-
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm -lrt
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index 58ccdc3502..22a82d472f 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -18,23 +18,23 @@ CC_OUT := -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 
 ifeq ($(HB_COMPILER),icc)
-CFLAGS = -D_GNU_SOURCE
-#CFLAGS += -std=c99
-#CFLAGS += -xHOST
+   CFLAGS = -D_GNU_SOURCE
+   #CFLAGS += -std=c99
+   #CFLAGS += -xHOST
 else
-CFLAGS =
+   CFLAGS =
 endif
 
 ifneq ($(HB_BUILD_WARN),no)
-ifeq ($(HB_COMPILER),icc)
-#CFLAGS += -w2 -Wall
-else
-CFLAGS += -Wall -W
-endif
+   ifeq ($(HB_COMPILER),icc)
+      #CFLAGS += -w2 -Wall
+   else
+      CFLAGS += -Wall -W
+   endif
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 # uncomment this if you want to force relocateable code for .so libs
@@ -42,7 +42,7 @@ endif
 #CFLAGS += -fPIC
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
@@ -54,37 +54,32 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := ncurses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
 ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
+   LINKLIBS += -lgpm
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm -lrt -ldl
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index 248c582a0a..0557701948 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -23,11 +23,11 @@ CFLAGS = -D_GNU_SOURCE
 #CFLAGS += -std=c99
 
 ifneq ($(HB_BUILD_WARN),no)
-#CFLAGS += -w2 -Wall
+   #CFLAGS += -w2 -Wall
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 
@@ -36,7 +36,7 @@ endif
 #CFLAGS += -fPIC
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCACHE) $(HB_CMP)
@@ -48,37 +48,32 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := ncurses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
 ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
+   LINKLIBS += -lgpm
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm -lrt -ldl
diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf
index 61d17ff3b6..463910da5e 100644
--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -58,36 +58,31 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := ncurses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := ncurses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-LINKPATHS += -L/usr/X11R6/lib
+   LINKLIBS += -lX11
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
 ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
+   LINKLIBS += -lgpm
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm -lrt -ldl
diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf
index 453d39b7b5..1d5259aa74 100644
--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -16,14 +16,14 @@ LIB_PREF :=
 LIB_EXT := .lib
 
 ifeq ($(HB_BUILD_MODE),c)
-CC := wcc386
+   CC := wcc386
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CC := wpp386
+   CC := wpp386
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-CC := wpp386
+   CC := wpp386
 endif
 CC_IN :=
 CC_OUT := -fo=
@@ -31,32 +31,31 @@ CC_OUT := -fo=
 CPPFLAGS = -zq -bt=linux
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -w3
+   CPPFLAGS += -w3
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# architecture flags
-CPPFLAGS += -6r -fp6
+   # architecture flags
+   CPPFLAGS += -6r -fp6
 
-# optimization flags
-# don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-# -oxaht
-CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-#CPPFLAGS += -obl+m
-ifeq ($(CC),wpp386)
-CPPFLAGS += -oi+
+   # optimization flags
+   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
+   # -oxaht
+   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CPPFLAGS += -obl+m
+   ifeq ($(CC),wpp386)
+      CPPFLAGS += -oi+
+   else
+      CPPFLAGS += -oi
+   endif
 else
-CPPFLAGS += -oi
+   CPPFLAGS += -3r
 endif
-else
-CPPFLAGS += -3r
-endif
-
 
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -d2
+   CPPFLAGS += -d2
 endif
 
 empty:=
@@ -66,7 +65,7 @@ comma:= ,
 LD := wlink
 LDFLAGS = SYS linux
 ifeq ($(HB_BUILD_DEBUG),yes)
-LDFLAGS := DEBUG ALL $(LDFLAGS)
+   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif
 
 LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
@@ -74,9 +73,9 @@ LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 LDFILES = $(subst $(space),$(comma) ,$(^F))
 LDLIBS  = $(subst $(space),$(comma) ,$(strip $(LINKLIBS)))
 ifneq ($(HB_SHELL),sh)
-LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@. FILE $(LDFILES)
+   LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@. FILE $(LDFILES)
 else
-LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES)
+   LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES)
 endif
 ifneq ($(LDLIBS),)
    LD_RULE += LIB $(LDLIBS)
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index b281772bf2..3cac201624 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -19,15 +19,15 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CMP)
@@ -37,10 +37,10 @@ LDFLAGS =
 LD_OUT := -o$(subst x,x, )
 
 ifeq ($(C_MAIN),)
-ifeq ($(HB_GT_LIB),os2pm)
-# If building a PM program, override the main object.
-LDFLAGS +=$(TOP)$(ROOT)source/vm/$(OBJ_DIR)/mainpm.o
-endif
+   ifeq ($(HB_GT_LIB),os2pm)
+      # If building a PM program, override the main object.
+      LDFLAGS += $(TOP)$(ROOT)source/vm/$(OBJ_DIR)/mainpm.o
+   endif
 endif
 
 # Add all libraries specified in LIBS.
@@ -49,13 +49,13 @@ LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
 ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-ifeq ($(C_MAIN),)
-ifeq ($(findstring os2pm,$(HB_GT_LIB)),os2pm)
-# Special handling for PM mode
-LINKLIBS += -l$(HB_GT_LIB)
-LINKLIBS += -lgtos2
-endif
-endif
+   ifeq ($(C_MAIN),)
+      ifeq ($(findstring os2pm,$(HB_GT_LIB)),os2pm)
+         # Special handling for PM mode
+         LINKLIBS += -l$(HB_GT_LIB)
+         LINKLIBS += -lgtos2
+      endif
+   endif
 endif
 
 # add socket library
@@ -65,10 +65,10 @@ LINKLIBS += -lsocket
 LDFLAGS += $(LINKPATHS)
 
 ifeq ($(C_MAIN),)
-ifeq ($(HB_GT_LIB),os2pm)
-# Override the default link rule in order to add a call to emxbind
-LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) & emxbind -ep $@
-endif
+   ifeq ($(HB_GT_LIB),os2pm)
+      # Override the default link rule in order to add a call to emxbind
+      LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) & emxbind -ep $@
+   endif
 endif
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
@@ -89,7 +89,6 @@ echo END >> __lib__.tmp
 $(AR) -M < __lib__.tmp
 endef
 
-
 # Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is &
 AR := ar
 ARFLAGS = $(HB_USER_AFLAGS)
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index b1acb4df2a..0359bcab72 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -16,14 +16,14 @@ LIB_PREF :=
 LIB_EXT := .lib
 
 ifeq ($(HB_BUILD_MODE),c)
-CC := wcc386
+   CC := wcc386
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CC := wpp386
+   CC := wpp386
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-CC := wpp386
+   CC := wpp386
 endif
 CC_IN :=
 CC_OUT := -fo=
@@ -31,35 +31,35 @@ CC_OUT := -fo=
 CPPFLAGS = -zq -bt=os2
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -w3
+   CPPFLAGS += -w3
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# architecture flags
-CPPFLAGS += -5r -fp5
+   # architecture flags
+   CPPFLAGS += -5r -fp5
 
-# optimization flags
-# don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-#CPPFLAGS += -obl+m
-ifeq ($(CC),wpp386)
-CPPFLAGS += -oi+
-else
-CPPFLAGS += -oi
-endif
+   # optimization flags
+   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
+   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CPPFLAGS += -obl+m
+   ifeq ($(CC),wpp386)
+      CPPFLAGS += -oi+
+   else
+      CPPFLAGS += -oi
+   endif
 endif
 
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -d2
+   CPPFLAGS += -d2
 endif
 
 ifeq ($(CC),wcc386)
-ifneq ($(HB_HOST_ARCH),linux)
-CPPFLAGS := $(subst /,\,$(CPPFLAGS))
-CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
-endif
+   ifneq ($(HB_HOST_ARCH),linux)
+      CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+      CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+   endif
 endif
 
 empty:=
@@ -69,7 +69,7 @@ comma:= ,
 LD := wlink
 LDFLAGS = SYS os2v2
 ifeq ($(HB_BUILD_DEBUG),yes)
-LDFLAGS := DEBUG ALL $(LDFLAGS)
+   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif
 
 LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 5ef1ec583a..8c65cf5846 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -24,17 +24,17 @@ CFLAGS =
 LDFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
+   CFLAGS += -O3
 endif
 
 CFLAGS += -fPIC
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCACHE) $(HB_CMP)
@@ -45,32 +45,27 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := curses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := curses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-#LINKPATHS += -L/usr/X11R6/lib64
-LINKPATHS += -L/usr/X11R6/lib
-endif
-
+   LINKLIBS += -lX11
+   #LINKPATHS += -L/usr/X11R6/lib64
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+   LINKLIBS += -lpcre
 endif
 
 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+   LINKLIBS += -lz
 endif
 
 LINKLIBS += -lm -lrt
diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf
index f51e4c880c..9d2395abcf 100644
--- a/harbour/config/sunos/sunpro.cf
+++ b/harbour/config/sunos/sunpro.cf
@@ -68,23 +68,18 @@ LINKPATHS += -L$(LIB_DIR)
 LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
-ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
-
-# screen driver libraries
-ifeq ($(HB_CRS_LIB),)
-HB_CRS_LIB := curses
-endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-LINKLIBS += -l$(HB_CRS_LIB)
+   ifeq ($(HB_CRS_LIB),)
+      HB_CRS_LIB := curses
+   endif
+   LINKLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-LINKLIBS += -lslang
+   LINKLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-LINKLIBS += -lX11
-LINKPATHS += -L/usr/X11R6/lib
-endif
-
+   LINKLIBS += -lX11
+   LINKPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index 60a1f07798..7e49764e15 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -19,17 +19,17 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# Use -O2 instead of -O3 here.
-CFLAGS += -O2
-CFLAGS += -fomit-frame-pointer
+   # Use -O2 instead of -O3 here.
+   CFLAGS += -O2
+   CFLAGS += -fomit-frame-pointer
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCPREFIX)$(HB_CMP)
diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf
index 5edb8a9f9e..8f9f18b6d3 100644
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -9,9 +9,9 @@ LIB_PREF :=
 LIB_EXT := .lib
 
 ifeq ($(HB_VISUALC_VER_PRE80),)
-CC := cl.exe
+   CC := cl.exe
 else
-CC := clarm.exe
+   CC := clarm.exe
 endif
 CC_IN := -c
 CC_OUT := -Fo
@@ -19,32 +19,32 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -nologo -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
 
 ifeq ($(HB_BUILD_MODE),c)
-CFLAGS += -TC
+   CFLAGS += -TC
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CFLAGS += -TP
+   CFLAGS += -TP
 endif
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -W4
+   CFLAGS += -W4
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-ifeq ($(HB_VISUALC_VER_PRE80),)
-CFLAGS += -Od -Os -Gy -GS- -EHsc- -Gm -Zi -GR-
-else
-CFLAGS += -Oxsb1 -EHsc -YX -GF
-endif
+   ifeq ($(HB_VISUALC_VER_PRE80),)
+      CFLAGS += -Od -Os -Gy -GS- -EHsc- -Gm -Zi -GR-
+   else
+      CFLAGS += -Oxsb1 -EHsc -YX -GF
+   endif
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -Zi
+   CFLAGS += -Zi
 endif
 
 ifeq ($(HB_VISUALC_VER_PRE80),)
-LD := cl.exe
+   LD := cl.exe
 else
-LD := clarm.exe
+   LD := clarm.exe
 endif
 LD_OUT := -Fe
 
@@ -52,7 +52,7 @@ LINKPATHS += /link
 LINKPATHS += /subsystem:windowsce,4.20 /machine:arm /armpadcode /stack:65536,4096 /nodefaultlib:"oldnames.lib"
 LINKPATHS += /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf
 ifeq ($(HB_VISUALC_VER_PRE80),)
-LINKPATHS += /manifest:no
+   LINKPATHS += /manifest:no
 endif
 LINKPATHS += /libpath:$(LIB_DIR)
 # Add all libraries specified in LIBS.
diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf
index fa512c3956..bbf3f69207 100644
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -16,23 +16,23 @@ CPPFLAGS = -I.
 CPPFLAGS += -Ze -Go
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -W1
+   CPPFLAGS += -W1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CPPFLAGS += -Ot
-# -Ox: can cause GPF in 4.50/5.00, so it's disabled.
+   CPPFLAGS += -Ot
+   # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
 endif
 
 # For Pocket PC and ARM processors (including XScale)
 CPPFLAGS += -Tarm-coff -D_M_ARM -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE
 
 ifneq ($(HB_INC_COMPILE),)
-CPPFLAGS += -I$(HB_INC_COMPILE)
+   CPPFLAGS += -I$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -Zi
+   CPPFLAGS += -Zi
 endif
 
 CFLAGS =
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index 1aaaf35726..86d4f9c189 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -15,21 +15,21 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -q -tWM
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -w -w-sig- -Q
+   CFLAGS += -w -w-sig- -Q
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# for some reason -6 generates the exact same code as -4 with both 5.5 and 5.8.
-# -5 seems to be significantly slower than both. [vszakats]
-CFLAGS += -d -6 -O2 -OS -Ov -Oi -Oc
+   # for some reason -6 generates the exact same code as -4 with both 5.5 and 5.8.
+   # -5 seems to be significantly slower than both. [vszakats]
+   CFLAGS += -d -6 -O2 -OS -Ov -Oi -Oc
 endif
 
 ifeq ($(HB_BUILD_MODE),cpp)
-CFLAGS += -P
+   CFLAGS += -P
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -y -v
+   CFLAGS += -y -v
 endif
 
 LD := bcc32.exe
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index 48a83d3955..25426523d7 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -19,16 +19,16 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
-CFLAGS += -fomit-frame-pointer -march=i586 -mtune=pentiumpro
+   CFLAGS += -O3
+   CFLAGS += -fomit-frame-pointer -march=i586 -mtune=pentiumpro
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CMP)
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index ed4de19250..7a89270536 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -16,24 +16,24 @@ CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE)
 CFLAGS = -Gs
 
 ifeq ($(HB_BUILD_MODE),c)
-CPPFLAGS += -TC
+   CPPFLAGS += -TC
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CPPFLAGS += -TP
+   CPPFLAGS += -TP
 endif
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -W3
+   CFLAGS += -W3
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# maximum optimizations
-# CFLAGS += -Ox
-CFLAGS += -O3
+   # maximum optimizations
+   # CFLAGS += -Ox
+   CFLAGS += -O3
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -Zi
+   CFLAGS += -Zi
 endif
 
 LD := icl.exe
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 8d84cd93f7..1aa3784a70 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -19,19 +19,19 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS =
 
 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -O3
-CFLAGS += -fomit-frame-pointer
-ifeq ($(HB_COMPILER),mingw)
-CFLAGS += -march=i586 -mtune=pentiumpro
-endif
+   CFLAGS += -O3
+   CFLAGS += -fomit-frame-pointer
+   ifeq ($(HB_COMPILER),mingw)
+      CFLAGS += -march=i586 -mtune=pentiumpro
+   endif
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -g
+   CFLAGS += -g
 endif
 
 LD := $(HB_CCPREFIX)$(HB_CMP)
@@ -42,9 +42,9 @@ LIBLIST = $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the standard C main() entry
 ifeq ($(HB_MAIN),std)
-ifeq ($(findstring hbvm,$(LIBS)),hbvm)
-LIBLIST += -lhbmainstd
-endif
+   ifeq ($(findstring hbvm,$(LIBS)),hbvm)
+      LIBLIST += -lhbmainstd
+   endif
 endif
 
 LDFLAGS :=
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index f1fa87f359..5f5638046e 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -12,38 +12,38 @@ CC_OUT := -Fo
 CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) -Gs
 
 ifeq ($(HB_BUILD_MODE),c)
-CPPFLAGS += -TC
+   CPPFLAGS += -TC
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CPPFLAGS += -TP
+   CPPFLAGS += -TP
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-CPPFLAGS += -TP
+   CPPFLAGS += -TP
 endif
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -W4 -wd4127
+   CPPFLAGS += -W4 -wd4127
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-ifeq ($(HB_VISUALC_VER_PRE80),)
-CPPFLAGS += -Ot2b1 -EHs-c-
-else
-CPPFLAGS += -Ogt2yb1p -GX- -G6 -YX
-endif
+   ifeq ($(HB_VISUALC_VER_PRE80),)
+      CPPFLAGS += -Ot2b1 -EHs-c-
+   else
+      CPPFLAGS += -Ogt2yb1p -GX- -G6 -YX
+   endif
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -MTd -Zi
+   CPPFLAGS += -MTd -Zi
 else
-CPPFLAGS += -MT
+   CPPFLAGS += -MT
 endif
 
 # # NOTE: -GA flag should be disabled when building MT _.dlls_,
 # #       as it creates bad code according to MS docs [vszakats].
 # ifeq ($(HB_VISUALC_VER_PRE70),)
-# CPPFLAGS += -GA
+#    CPPFLAGS += -GA
 # endif
 
 LD := link.exe
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index ac96411640..efde21f2e7 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -16,20 +16,20 @@ CPPFLAGS = -I.
 CPPFLAGS += -Ze -Go -MT
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -W1
+   CPPFLAGS += -W1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CPPFLAGS += -Ot
-# -Ox: can cause GPF in 4.50/5.00, so it's disabled.
+   CPPFLAGS += -Ot
+   # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
 endif
 
 ifneq ($(HB_INC_COMPILE),)
-CPPFLAGS += -I$(HB_INC_COMPILE)
+   CPPFLAGS += -I$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -Zi
+   CPPFLAGS += -Zi
 endif
 
 CFLAGS =
diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf
index d4318bef1e..f5451b59ed 100644
--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -16,14 +16,14 @@ LIB_PREF :=
 LIB_EXT := .lib
 
 ifeq ($(HB_BUILD_MODE),c)
-CC := wcc386
+   CC := wcc386
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-CC := wpp386
+   CC := wpp386
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-CC := wpp386
+   CC := wpp386
 endif
 CC_IN :=
 CC_OUT := -fo=
@@ -31,37 +31,37 @@ CC_OUT := -fo=
 CPPFLAGS = -zq -bt=nt -bm
 
 ifneq ($(HB_BUILD_WARN),no)
-CPPFLAGS += -w3
+   CPPFLAGS += -w3
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# architecture flags
-CPPFLAGS += -6s -fp6
+   # architecture flags
+   CPPFLAGS += -6s -fp6
 
-# optimization flags
-# don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-# -oxaht
-CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-ifeq ($(CC),wpp386)
-CPPFLAGS += -oi+
+   # optimization flags
+   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
+   # -oxaht
+   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
+   ifeq ($(CC),wpp386)
+      CPPFLAGS += -oi+
+   else
+      CPPFLAGS += -oi
+   endif
 else
-CPPFLAGS += -oi
-endif
-else
-CPPFLAGS += -3s
+   CPPFLAGS += -3s
 endif
 
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CPPFLAGS += -d2
+   CPPFLAGS += -d2
 endif
 
 ifeq ($(CC),wcc386)
-ifneq ($(HB_HOST_ARCH),linux)
-CPPFLAGS := $(subst /,\,$(CPPFLAGS))
-CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
-endif
+   ifneq ($(HB_HOST_ARCH),linux)
+      CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+      CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+   endif
 endif
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
@@ -88,7 +88,7 @@ endef
 LD := wlink
 LDFLAGS = SYS nt
 ifeq ($(HB_BUILD_DEBUG),yes)
-LDFLAGS := DEBUG ALL $(LDFLAGS)
+   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif
 
 LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf
index cff60bad8e..f41ee5d3d0 100644
--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -13,19 +13,19 @@ CC_IN := -c
 CC_OUT := -Fo
 CFLAGS = -I.
 ifneq ($(HB_INC_COMPILE),)
-CFLAGS += -I$(HB_INC_COMPILE)
+   CFLAGS += -I$(HB_INC_COMPILE)
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
-# disabled - it produces bad code
-#CFLAGS += -Ot
+   # disabled - it produces bad code
+   #CFLAGS += -Ot
 endif
 
 # For Pocket PC and ARM processors (including XScale)
 #CFLAGS += /Tarm-coff
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -Zi
+   CFLAGS += -Zi
 endif
 
 LD := xlink.exe