2009-12-04 01:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* config/beos/gcc.mk * config/global.mk * config/bsd/gcc.mk * config/wce/mingwarm.mk * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/hpux/gcc.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/darwin/clang.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/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 % Moved initialization of *FLAGS vars into global.mk. Compiler .mk files only append to these vars. * Minor syncing between compilers regarding initial CFLAGS setup.
2009-12-04 00:47:16 +00:00
parent 43d68fd1de
commit 55c332e09c
30 changed files with 86 additions and 117 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,40 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-12-04 01:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/beos/gcc.mk
+  * config/global.mk
+  * config/bsd/gcc.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/hpux/gcc.mk
+  * config/darwin/gcc.mk
+  * config/darwin/icc.mk
+  * config/darwin/clang.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/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
+    % Moved initialization of *FLAGS vars into global.mk.
+      Compiler .mk files only append to these vars.
+    * Minor syncing between compilers regarding initial CFLAGS setup.
+
 2009-12-04 00:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * config/beos/gcc.mk
  * config/bsd/gcc.mk
@@ -93,7 +127,7 @@
   * config/wce/msvcarm.mk
   * config/win/msvc.mk
     + Added -debug linker option for executables.
-     ; TODO: Add it for .dlls too.
+     ; TODO: Add it for .dlls too. [DONE]

   * config/globsh.mk
     + Deleting (MSVC) .pdb and .ilk files for executables and dynlibs on 'make clean'.
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -18,10 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

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

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

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

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -22,10 +22,7 @@ endif
 # NOTE: Works also without the ending space after -o.
 CC_OUT := -o$(subst x,x, )

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

 # -fno-common enables building .dylib files
 CFLAGS += -fno-common
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -20,10 +20,7 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

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

 # -no-cpp-precomp prevents from using buggy precompiled headers
 # CFLAGS += -no-cpp-precomp
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -16,10 +16,7 @@ CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o

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

 CFLAGS += -D_GNU_SOURCE

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

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

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

-CFLAGS := -zq -bt=dos
-ARFLAGS :=
-LDFLAGS := OP quiet
-DFLAGS :=
+CFLAGS += -zq -bt=dos
+LDFLAGS += OP quiet

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -w3
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1040,6 +1040,11 @@ HB_CFLAGS :=
 HB_LDFLAGS :=
 HB_PRGFLAGS :=

+CFLAGS :=
+ARFLAGS :=
+LDFLAGS :=
+DFLAGS :=
+
 HB_CROSS_BUILD :=
 ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
   ifeq ($(HB_BIN_COMPILE),)
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -18,10 +18,11 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

-CFLAGS := -I. -I$(HB_INC_COMPILE)
-ARFLAGS :=
-LDFLAGS :=
-DFLAGS :=
+CFLAGS += -I. -I$(HB_INC_COMPILE)
+
+# uncomment this if you want to force creating 64bit binaries on IA64
+#CFLAGS += -mlp64
+#LDFLAGS += -mlp64

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -Wall -W
@@ -31,10 +32,6 @@ ifneq ($(HB_BUILD_OPTIM),no)
   CFLAGS += -O3
 endif

-# uncomment this if you want to force creating 64bit binaries on IA64
-#CFLAGS += -mlp64
-#LDFLAGS += -mlp64
-
 ifeq ($(HB_BUILD_DEBUG),yes)
   CFLAGS += -g
 endif
--- a/harbour/config/linux/clang.mk
+++ b/harbour/config/linux/clang.mk
@@ -23,10 +23,7 @@ else
 endif
 CC_OUT := -o

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

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

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

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

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

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

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

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

 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -21,10 +21,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CFLAGS := -zq -bt=linux
-ARFLAGS :=
-LDFLAGS := OP quiet
-DFLAGS :=
+CFLAGS += -zq -bt=linux
+LDFLAGS += OP quiet

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -w3
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -20,10 +20,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

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

 ifeq ($(HB_COMPILER),gccomf)
   CFLAGS += -Zomf
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -23,10 +23,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

-CFLAGS := -zq -bt=os2 -bm
-ARFLAGS :=
-LDFLAGS := OP quiet
-DFLAGS :=
+CFLAGS += -zq -bt=os2 -bm
+LDFLAGS += OP quiet

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -w3
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -20,10 +20,7 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )

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

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

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

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

 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -16,10 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

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

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

-CFLAGS := -I. -I$(HB_INC_COMPILE)
-ARFLAGS :=
-LDFLAGS :=
-DFLAGS :=
+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

--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -14,10 +14,9 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo

-CFLAGS := -I. -I$(HB_INC_COMPILE) -Ze -Go
-ARFLAGS :=
-LDFLAGS :=
-DFLAGS :=
+CFLAGS += -I. -I$(HB_INC_COMPILE)
+
+CFLAGS += -Ze -Go

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -W1
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -14,10 +14,9 @@ CC := bcc32.exe
 CC_IN := -c
 CC_OUT := -o

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

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -w -w-sig- -Q
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -16,10 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

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

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

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

 ifeq ($(HB_BUILD_MODE),c)
   CFLAGS += -TC
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -16,10 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o

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

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

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

 ifeq ($(HB_BUILD_MODE),c)
   CFLAGS += -TC
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -14,10 +14,9 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo

-CFLAGS := -I. -I$(HB_INC_COMPILE) -Ze -Go -MT
-ARFLAGS :=
-LDFLAGS :=
-DFLAGS :=
+CFLAGS += -I. -I$(HB_INC_COMPILE)
+
+CFLAGS += -Ze -Go -MT

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -W1
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -23,10 +23,8 @@ endif
 CC_IN :=
 CC_OUT := -fo=

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

 ifneq ($(HB_BUILD_WARN),no)
   CFLAGS += -w3
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -14,15 +14,12 @@ CC := xcc.exe
 CC_IN := -c
 CC_OUT := -Fo

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

 CFLAGS += -MT