2009-08-11 09:55 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 % CFLAGS and CPPFLAGS initialized using := operator. ! Fixed not initializing CFLAGS/CPPFLAGS at all for some compilers. This may cause spilling of unwanted switches into our make system. (watcom.cf) * Few remaining indentations left from previous round (sunpro.cf). * Some other minor cleanups along the way (xcc.cf).
2009-08-11 07:57:13 +00:00
parent a209784591
commit 3d0b0e9e1b
25 changed files with 113 additions and 66 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,38 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-08-11 09:55 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
+    % CFLAGS and CPPFLAGS initialized using := operator.
+    ! Fixed not initializing CFLAGS/CPPFLAGS at all for some compilers.
+      This may cause spilling of unwanted switches into our make system.
+      (watcom.cf)
+    * Few remaining indentations left from previous round (sunpro.cf).
+    * Some other minor cleanups along the way (xcc.cf).
+
 2009-08-11 09:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * config/bsd/gcc.cf
  * config/wce/msvcarm.cf
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -15,6 +15,7 @@ LIB_EXT := .a
 CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
+
 CPPFLAGS := -I. -I$(HB_INC_COMPILE)
 CFLAGS :=

--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -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)
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)

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

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

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -15,8 +15,9 @@ LIB_EXT := .a
 CC := $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS =
+
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -28,7 +28,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS = -zq -bt=dos
+CPPFLAGS := -zq -bt=dos
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -w3
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -15,9 +15,10 @@ LIB_EXT := .a
 CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)

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

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -15,14 +15,15 @@ LIB_EXT := .a
 CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
+
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)

 ifeq ($(HB_COMPILER),icc)
-   CFLAGS = -D_GNU_SOURCE
+   CFLAGS := -D_GNU_SOURCE
   #CFLAGS += -std=c99
   #CFLAGS += -xHOST
 else
-   CFLAGS =
+   CFLAGS :=
 endif

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -15,11 +15,11 @@ LIB_EXT := .a
 CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)

-#CFLAGS = -fast
-#CFLAGS = -xHOST
-CFLAGS = -D_GNU_SOURCE
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS := -D_GNU_SOURCE
+#CFLAGS += -fast
+#CFLAGS += -xHOST
 #CFLAGS += -std=c99

 ifneq ($(HB_BUILD_WARN),no)
@@ -30,7 +30,6 @@ ifneq ($(HB_BUILD_OPTIM),no)
   CFLAGS += -O3
 endif

-
 # uncomment this if you want to force relocateable code for .so libs
 # it's necessary on some platforms but can reduce performance
 #CFLAGS += -fPIC
--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -16,9 +16,10 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 CC_IN := -c
 # NOTE: The ending space after -o is important, please preserve it.
 #       Now solved with '$(subst x,x, )' expression.
-CC_OUT = -o$(subst x,x, )
+CC_OUT := -o$(subst x,x, )

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

 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
@@ -31,23 +32,23 @@ LDFLAGS ?= $(HB_ISAOPT)
 export HB_ISAOPT

 ifneq ($(HB_BUILD_OPTIM),no)
-# Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
-# conform to the Blastwave build standards, see
-#    http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
-# Try to keep them this way.
-CFLAGS = -fast $(HB_ISAOPT)
+   # Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
+   # conform to the Blastwave build standards, see
+   #    http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
+   # Try to keep them this way.
+   CFLAGS += -fast $(HB_ISAOPT)
 endif

 CFLAGS += -KPIC

 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -erroff=%none
+   CFLAGS += -erroff=%none
 else
-CFLAGS += -erroff=%all
+   CFLAGS += -erroff=%all
 endif

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

 LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -28,7 +28,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS = -zq -bt=linux
+CPPFLAGS := -zq -bt=linux
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -w3
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -15,8 +15,9 @@ LIB_EXT := .a
 CC := $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS =
+
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -28,7 +28,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS = -zq -bt=os2
+CPPFLAGS := -zq -bt=os2
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -w3
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -18,9 +18,9 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

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

-CFLAGS =
 LDFLAGS =

 ifneq ($(HB_BUILD_WARN),no)
--- a/harbour/config/sunos/sunpro.cf
+++ b/harbour/config/sunos/sunpro.cf
@@ -18,7 +18,8 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

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

 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
@@ -33,31 +34,31 @@ LDFLAGS ?= $(HB_ISAOPT)
 export HB_ISAOPT

 ifneq ($(HB_BUILD_OPTIM),no)
-# Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
-# conform to the Blastwave build standards, see
-#    http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
-# Try to keep them this way.
-CFLAGS = -fast $(HB_ISAOPT)
-ifneq ($(HB_BUILD_MODE),cpp)
-CFLAGS += -xstrconst
-endif
-CFLAGS += -xnolibmopt
+   # Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
+   # conform to the Blastwave build standards, see
+   #    http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
+   # Try to keep them this way.
+   CFLAGS += -fast $(HB_ISAOPT)
+   ifneq ($(HB_BUILD_MODE),cpp)
+      CFLAGS += -xstrconst
+   endif
+   CFLAGS += -xnolibmopt
 endif

 ifeq ($(findstring sparc,$(shell isalist)),sparc)
-CFLAGS += -xcode=pic32
+   CFLAGS += -xcode=pic32
 else
-CFLAGS += -KPIC
+   CFLAGS += -KPIC
 endif

 ifneq ($(HB_BUILD_WARN),no)
-CFLAGS += -erroff=%none
+   CFLAGS += -erroff=%none
 else
-CFLAGS += -erroff=%all
+   CFLAGS += -erroff=%all
 endif

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

 LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -15,8 +15,9 @@ LIB_EXT := .a
 CC := $(HB_CCPREFIX)$(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS =
+
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -15,8 +15,9 @@ else
 endif
 CC_IN := -c
 CC_OUT := -Fo
-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
+
+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
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -11,9 +11,10 @@ LIB_EXT := .lib
 CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo
-CPPFLAGS = -I.

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

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -W1
@@ -35,8 +36,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CPPFLAGS += -Zi
 endif

-CFLAGS =
-
 LD := polink.exe
 LD_OUT := -OUT:

--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -11,6 +11,7 @@ LIB_EXT := .lib
 CC := bcc32.exe
 CC_IN := -c
 CC_OUT := -o
+
 CPPFLAGS := -I. -I$(HB_INC_COMPILE)
 CFLAGS := -q -tWM

--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -15,6 +15,7 @@ LIB_EXT := .a
 CC := $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
+
 CPPFLAGS := -I. -I$(HB_INC_COMPILE)
 CFLAGS :=

--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -12,8 +12,9 @@ LIB_EXT := .lib
 CC := icl.exe
 CC_IN := -c
 CC_OUT := -Fo
-CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Gs
+
+CPPFLAGS := -nologo -I. -I$(HB_INC_COMPILE)
+CFLAGS := -Gs

 ifeq ($(HB_BUILD_MODE),c)
   CPPFLAGS += -TC
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -15,8 +15,9 @@ LIB_EXT := .a
 CC := $(HB_CCPREFIX)$(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS =
+
+CPPFLAGS := -I. -I$(HB_INC_COMPILE)
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -9,7 +9,9 @@ LIB_EXT := .lib
 CC := cl.exe
 CC_IN := -c
 CC_OUT := -Fo
-CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) -Gs
+
+CPPFLAGS := -nologo -I. -I$(HB_INC_COMPILE) -Gs
+CFLAGS :=

 ifeq ($(HB_BUILD_MODE),c)
   CPPFLAGS += -TC
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -11,9 +11,10 @@ LIB_EXT := .lib
 CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo
-CPPFLAGS = -I.

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

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -W1
@@ -32,8 +33,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   CPPFLAGS += -Zi
 endif

-CFLAGS =
-
 LD := polink.exe
 LD_OUT := -OUT:

--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -28,7 +28,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CPPFLAGS = -zq -bt=nt -bm
+CPPFLAGS := -zq -bt=nt -bm
+CFLAGS :=

 ifneq ($(HB_BUILD_WARN),no)
   CPPFLAGS += -w3
--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -11,10 +11,9 @@ LIB_EXT := .lib
 CC := xcc.exe
 CC_IN := -c
 CC_OUT := -Fo
-CFLAGS = -I.
-ifneq ($(HB_INC_COMPILE),)
-   CFLAGS += -I$(HB_INC_COMPILE)
-endif
+
+CPPFLAGS :=
+CFLAGS := -I. -I$(HB_INC_COMPILE)

 ifneq ($(HB_BUILD_OPTIM),no)
   # disabled - it produces bad code