2009-11-23 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* config/beos/gcc.mk * config/bsd/gcc.mk * config/wce/mingwarm.mk * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/darwin/clang.mk * config/hpux/gcc.mk * config/dos/watcom.mk * config/dos/djgpp.mk * config/win/xcc.mk * config/win/mingw.mk * config/win/pocc.mk * config/win/bcc.mk * config/win/watcom.mk * config/win/icc.mk * config/win/pocc64.mk * config/win/cygwin.mk * config/win/msvc.mk * config/linux/watcom.mk * config/linux/gcc.mk * config/linux/icc.mk * config/linux/clang.mk * config/linux/sunpro.mk * config/os2/watcom.mk * config/os2/gcc.mk * config/sunos/gcc.mk * config/sunos/sunpro.mk + Uniformly using CFLAGS to store C compilation flags, instead of a previous mixture of CPPFLAGS and CFLAGS. * config/rules.mk - Deleted CPPFLAGS. * INSTALL * bin/postinst.bat ! Minor fixes in texts.
2009-11-23 12:17:30 +00:00
parent 5064ad4326
commit 044107d4a2
33 changed files with 158 additions and 144 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,46 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-11-23 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/beos/gcc.mk
+  * config/bsd/gcc.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/darwin/gcc.mk
+  * config/darwin/icc.mk
+  * config/darwin/clang.mk
+  * config/hpux/gcc.mk
+  * config/dos/watcom.mk
+  * config/dos/djgpp.mk
+  * config/win/xcc.mk
+  * config/win/mingw.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/win/icc.mk
+  * config/win/pocc64.mk
+  * config/win/cygwin.mk
+  * config/win/msvc.mk
+  * config/linux/watcom.mk
+  * config/linux/gcc.mk
+  * config/linux/icc.mk
+  * config/linux/clang.mk
+  * config/linux/sunpro.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+    + Uniformly using CFLAGS to store C compilation flags, instead
+      of a previous mixture of CPPFLAGS and CFLAGS.
+
+  * config/rules.mk
+    - Deleted CPPFLAGS.
+
+  * INSTALL
+  * bin/postinst.bat
+    ! Minor fixes in texts.
+
 2009-11-23 10:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbwin/win_prn2.c
    ! Commented buggy code dealing with Chr( 26 ) strippage in PRINTFILERAW().
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -190,7 +190,7 @@ HARBOUR

   If you want to [re]build only a specific part of Harbour, like
   one library, all contrib libs or core libs, you have to do
-   everything the same as for a full build, the only difference
+   everything the same way as for a full build, the only difference
   is that you first have to go into the specific source directory
   you want to [re]build. When starting GNU Make, all components
   under that dir will be built:
@@ -842,7 +842,7 @@ HARBOUR
      both x86 and x64 without building a native target first, and potential
      differences in compilers to use native binaries if they are available.

-      --- Windows SDK 7
+      --- Windows SDK 7 for Windows x86
      call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
      mingw32-make
      ---
@@ -852,7 +852,7 @@ HARBOUR
      mingw32-make
      ---

-      --- MSVC 2008
+      --- MSVC 2008 for Windows x86
      call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
      mingw32-make
      ---
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -79,7 +79,7 @@ if "%HB_SHELL%" == "nt" goto _SH_NT
   rem       without including the whole root path in filenames; you have to 'cd' into it.
   rem       Even with zip 3.0. For this reason we need absolute path in HB_TOP. There is also
   rem       no zip 2.x compatible way to force creation of a new .zip, so we have to delete it
-   rem       first to avoid mixing in an existing .zip files. [vszakats]
+   rem       first to avoid mixing in an existing .zip file. [vszakats]

   echo ! Making Harbour .zip install package: '%HB_TOP%\%HB_PKGNAME%.zip'
   if exist "%HB_TOP%\%HB_PKGNAME%.zip" del "%HB_TOP%\%HB_PKGNAME%.zip"
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -18,8 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -23,27 +23,27 @@ endif
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS := -I. -I$(HB_INC_COMPILE)

 # -fno-common enables building .dylib files
-CPPFLAGS += -fno-common
+CFLAGS += -fno-common
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -Wall -W
+   CFLAGS += -Wall -W
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
-   CPPFLAGS += -O3
+   CFLAGS += -O3
 endif

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -g
+   CFLAGS += -g
 endif

 # It's to avoid warning message generated when 'long double' is used
 # remove it if you have newer compiler version
-#CPPFLAGS += -Wno-long-double
+#CFLAGS += -Wno-long-double

 LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -20,13 +20,13 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS := -I. -I$(HB_INC_COMPILE)

 # -no-cpp-precomp prevents from using buggy precompiled headers
-# CPPFLAGS += -no-cpp-precomp
+# CFLAGS += -no-cpp-precomp

 # -fno-common enables building .dylib files
-CFLAGS := -fno-common
+CFLAGS += -fno-common
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 CFLAGS += -D_GNU_SOURCE
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -21,36 +21,35 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS := -zq -bt=dos
-CFLAGS :=
+CFLAGS := -zq -bt=dos
 LDFLAGS := OP quiet

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -w3
+   CFLAGS += -w3
 else
-   CPPFLAGS += -w0
+   CFLAGS += -w0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # architecture flags
-   CPPFLAGS += -5r -fp5
+   CFLAGS += -5r -fp5

   # optimization flags
   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
   # -oxaht
-   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-   #CPPFLAGS += -obl+m
+   CFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CFLAGS += -obl+m
   ifeq ($(CC),wpp386)
-      CPPFLAGS += -oi+
+      CFLAGS += -oi+
   else
-      CPPFLAGS += -oi
+      CFLAGS += -oi
   endif
 endif

-CPPFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_INC_COMPILE)

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -d2
+   CFLAGS += -d2
 endif

 LD := wlink
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -18,8 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/linux/clang.mk
+++ b/harbour/config/linux/clang.mk
@@ -23,8 +23,7 @@ else
 endif
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -18,8 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/linux/icc.mk
+++ b/harbour/config/linux/icc.mk
@@ -18,8 +18,7 @@ CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 CFLAGS += -D_GNU_SOURCE
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -22,8 +22,7 @@ CC_OUT := -o$(subst x,x, )

 CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCPOSTFIX)

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 # try to keep `-fast' as left as possible, as later optim
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -21,38 +21,37 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS := -zq -bt=linux
-CFLAGS :=
+CFLAGS := -zq -bt=linux
 LDFLAGS := OP quiet

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -w3
+   CFLAGS += -w3
 else
-   CPPFLAGS += -w0
+   CFLAGS += -w0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # architecture flags
-   CPPFLAGS += -6r -fp6
+   CFLAGS += -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
+   CFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CFLAGS += -obl+m
   ifeq ($(CC),wpp386)
-      CPPFLAGS += -oi+
+      CFLAGS += -oi+
   else
-      CPPFLAGS += -oi
+      CFLAGS += -oi
   endif
 else
-   CPPFLAGS += -3r
+   CFLAGS += -3r
 endif

-CPPFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_INC_COMPILE)

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -d2
+   CFLAGS += -d2
 endif

 LD := wlink
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -20,8 +20,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifeq ($(HB_COMPILER),gccomf)
@@ -71,9 +70,9 @@ ifeq ($(HB_COMPILER),gccomf)
   #       It causes that every command will be separated by LF
   define lib_object
      $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ $(file)$(ECHOQUOTE)
-  
+
   endef
-  
+
   define create_library
      $(if $(wildcard $(subst /,$(DIRSEP),$(LIB_FILE))),@$(RM) $(subst /,$(DIRSEP),$(LIB_FILE)),)
      $(foreach file,$^,$(lib_object))
@@ -83,7 +82,7 @@ else
   #       It causes that every command will be separated by LF
   define lib_object
      @$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
-   
+
   endef

   # We have to use a script to overcome the AR limit of max 850 characters
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -23,38 +23,37 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS := -zq -bt=os2
-CFLAGS :=
+CFLAGS := -zq -bt=os2
 LDFLAGS := OP quiet

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -w3
+   CFLAGS += -w3
 else
-   CPPFLAGS += -w0
+   CFLAGS += -w0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # architecture flags
-   CPPFLAGS += -5r -fp5
+   CFLAGS += -5r -fp5

   # optimization flags
   # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
   # -oxaht
-   CPPFLAGS += -onaehtr -s -ei -zp4 -zt0
-   #CPPFLAGS += -obl+m
+   CFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CFLAGS += -obl+m
   ifeq ($(CC),wpp386)
-      CPPFLAGS += -oi+
+      CFLAGS += -oi+
   else
-      CPPFLAGS += -oi
+      CFLAGS += -oi
   endif
 else
-   CPPFLAGS += -3r
+   CFLAGS += -3r
 endif

-CPPFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_INC_COMPILE)

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -d2
+   CFLAGS += -d2
 endif

 LD := wlink
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -33,7 +33,7 @@ HB_RULE = $(HB) $? $(HB_INC_DEPEND) -i$(HB_INC_COMPILE) $(HB_FLAGS) $(HB_USER_PR

 # Use default rules if platform/compiler specific rule is not defined

-CC_FLAGS := $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CFLAGS)
+CC_FLAGS := $(HB_INC_DEPEND) $(CFLAGS) $(HB_CFLAGS)

 # The rule to compile a C source file.
 ifeq ($(CC_RULE),)
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -20,8 +20,7 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -27,8 +27,7 @@ CC_OUT := -o$(subst x,x, )

 CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCPOSTFIX)

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 # try to keep `-fast' as left as possible, as later optim
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -17,8 +17,8 @@ endif
 CC_IN := -c
 CC_OUT := -Fo

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS := -nologo -D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -D_UNICODE -D_UWIN -DUNDER_CE
+CFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS += -nologo -D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -D_UNICODE -D_UWIN -DUNDER_CE

 ifeq ($(HB_COMPILER),msvcarm)
   CFLAGS += -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -14,31 +14,30 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo

-CPPFLAGS := -I.
-CPPFLAGS += -Ze -Go
-CFLAGS :=
+CFLAGS := -I.
+CFLAGS += -Ze -Go
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -W1
+   CFLAGS += -W1
 else
-   CPPFLAGS += -W0
+   CFLAGS += -W0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
-   CPPFLAGS += -Ot
+   CFLAGS += -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
+CFLAGS += -Tarm-coff -D_M_ARM -D_WINCE

 ifneq ($(HB_INC_COMPILE),)
-   CPPFLAGS += -I$(HB_INC_COMPILE)
+   CFLAGS += -I$(HB_INC_COMPILE)
 endif

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -Zi
+   CFLAGS += -Zi
 endif

 LD := polink.exe
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -14,8 +14,7 @@ CC := bcc32.exe
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS := -q -tWM
+CFLAGS := -I. -I$(HB_INC_COMPILE) -q -tWM
 LDFLAGS :=
 DFLAGS :=

--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -15,29 +15,28 @@ CC := icl.exe
 CC_IN := -c
 CC_OUT := -Fo

-CPPFLAGS := -nologo -I. -I$(HB_INC_COMPILE) -Gs
-CFLAGS :=
+CFLAGS := -nologo -I. -I$(HB_INC_COMPILE) -Gs
 LDFLAGS :=

 ifeq ($(HB_BUILD_MODE),c)
-   CPPFLAGS += -TC
+   CFLAGS += -TC
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-   CPPFLAGS += -TP
+   CFLAGS += -TP
 endif

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -W3
+   CFLAGS += -W3
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # maximum optimizations
-   # CPPFLAGS += -Ox
-   CPPFLAGS += -O3
+   # CFLAGS += -Ox
+   CFLAGS += -O3
 endif

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -Zi
+   CFLAGS += -Zi
 endif

 LD := xilink.exe
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -16,8 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -20,43 +20,42 @@ CC := cl.exe
 CC_IN := -c
 CC_OUT := -Fo

-CPPFLAGS := -nologo -I. -I$(HB_INC_COMPILE) -Gs
-CFLAGS :=
+CFLAGS := -nologo -I. -I$(HB_INC_COMPILE) -Gs
 LDFLAGS :=

 ifeq ($(HB_BUILD_MODE),c)
-   CPPFLAGS += -TC
+   CFLAGS += -TC
 endif
 ifeq ($(HB_BUILD_MODE),cpp)
-   CPPFLAGS += -TP
+   CFLAGS += -TP
 endif
 # Build in C++ mode by default
 ifeq ($(HB_BUILD_MODE),)
-   CPPFLAGS += -TP
+   CFLAGS += -TP
 endif

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -W4 -wd4127
+   CFLAGS += -W4 -wd4127
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
-      CPPFLAGS += -Ogt2yb1p -GX- -G6 -YX
+      CFLAGS += -Ogt2yb1p -GX- -G6 -YX
   else
-      CPPFLAGS += -Ot2b1 -EHs-c-
+      CFLAGS += -Ot2b1 -EHs-c-
   endif
 endif

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -MTd -Zi
+   CFLAGS += -MTd -Zi
 else
-   CPPFLAGS += -MT
+   CFLAGS += -MT
 endif

 # # NOTE: -GA flag should be disabled when building MT _.dlls_,
 # #       as it creates bad code according to MS docs [vszakats].
 # ifneq ($(filter $(HB_COMPILER_VER),600),)
-#    CPPFLAGS += -GA
+#    CFLAGS += -GA
 # endif

 LD := link.exe
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -14,28 +14,26 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo

-CPPFLAGS := -I.
-CPPFLAGS += -Ze -Go -MT
-CFLAGS :=
+CFLAGS := -I. -Ze -Go -MT
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -W1
+   CFLAGS += -W1
 else
-   CPPFLAGS += -W0
+   CFLAGS += -W0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
-   CPPFLAGS += -Ot
+   CFLAGS += -Ot
   # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
 endif

 ifneq ($(HB_INC_COMPILE),)
-   CPPFLAGS += -I$(HB_INC_COMPILE)
+   CFLAGS += -I$(HB_INC_COMPILE)
 endif

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -Zi
+   CFLAGS += -Zi
 endif

 LD := polink.exe
--- a/harbour/config/win/pocc64.mk
+++ b/harbour/config/win/pocc64.mk
@@ -4,4 +4,4 @@

 include $(TOP)$(ROOT)config/$(HB_PLATFORM)/pocc.mk

-CPPFLAGS += -Tamd64-coff
+CFLAGS += -Tamd64-coff
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -23,38 +23,37 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS := -zq -bt=nt -bm
-CFLAGS :=
+CFLAGS := -zq -bt=nt -bm
 LDFLAGS := OP quiet

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -w3
+   CFLAGS += -w3
 else
-   CPPFLAGS += -w0
+   CFLAGS += -w0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # architecture flags
-   CPPFLAGS += -6s -fp6
+   CFLAGS += -6s -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
+   CFLAGS += -onaehtr -s -ei -zp4 -zt0
+   #CFLAGS += -obl+m
   ifeq ($(CC),wpp386)
-      CPPFLAGS += -oi+
+      CFLAGS += -oi+
   else
-      CPPFLAGS += -oi
+      CFLAGS += -oi
   endif
 else
-   CPPFLAGS += -3s
+   CFLAGS += -3s
 endif

-CPPFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_INC_COMPILE)

 ifeq ($(HB_BUILD_DEBUG),yes)
-   CPPFLAGS += -d2
+   CFLAGS += -d2
 endif

 LD := wlink
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -14,29 +14,28 @@ CC := xcc.exe
 CC_IN := -c
 CC_OUT := -Fo

-CFLAGS :=
-CPPFLAGS := -I. -I$(TOP). -I$(TOP).. -I$(HB_INC_COMPILE)
+CFLAGS := -I. -I$(TOP). -I$(TOP).. -I$(HB_INC_COMPILE)
 ifeq ($(HB_SHELL),sh)
-   CPPFLAGS := $(subst /,\\,$(CPPFLAGS))
+   CFLAGS := $(subst /,\\,$(CFLAGS))
 else
-   CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+   CFLAGS := $(subst /,\,$(CFLAGS))
 endif
-CPPFLAGS += -MT
+CFLAGS += -MT
 LDFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
-   CPPFLAGS += -W1
+   CFLAGS += -W1
 else
-   CPPFLAGS += -W0
+   CFLAGS += -W0
 endif

 ifneq ($(HB_BUILD_OPTIM),no)
   # disabled - it produces bad code
-   #CPPFLAGS += -Ot
+   #CFLAGS += -Ot
 endif

 # For Pocket PC and ARM processors (including XScale)
-#CPPFLAGS += -Tarm-coff
+#CFLAGS += -Tarm-coff

 ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -Zi