diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dc26e254cf..a761220312 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,33 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 12:14 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/darwin/gcc.cf + * config/hpux/gcc.cf + * config/dos/djgpp.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/gcc.cf + * config/linux/icc.cf + * config/linux/sunpro.cf + * config/os2/gcc.cf + * config/sunos/gcc.cf + * config/sunos/sunpro.cf + ; Cleaned LINKPATHS usage. + % Using := instead of = assignment operator. + ! Fixed spillage of external LINKPATHS content with some compilers. + * Non-libpath related variable content moved to LDFLAGS. + ; TODO: Rename 'LINKPATHS' to 'LIBPATHS'. + 2009-08-11 12:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/fstemp.c ! Fixed regression in hb_fsCreateTemp() after 2009-08-07 11:55 UTC+0200 diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index f187d5fb4a..e59d578fc1 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -34,7 +34,7 @@ endif LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o -LINKPATHS = -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index cca681ac1b..8da8b7b67e 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -47,7 +47,7 @@ endif LD := $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) LD_OUT := -o -LINKPATHS = -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index f3be28fa1b..fc15560512 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -35,7 +35,7 @@ LD := $(HB_CMP) LD_OUT := -o LDLIBS = -lm -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 957777d2a0..d5cf864602 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -43,7 +43,7 @@ LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 2e3b08fc16..b2dcc27e58 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -50,7 +50,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 531546c96b..34af7b1dd6 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -42,7 +42,7 @@ LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index 655e06eb76..f26ec7437b 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -55,7 +55,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 8e2e4e150b..9804e42917 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -45,7 +45,7 @@ ifeq ($(C_MAIN),) endif # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 76a8be5870..7212e61915 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -41,7 +41,7 @@ LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index 6cfdd81a13..2a20fe5d97 100644 --- a/harbour/config/sunos/sunpro.cf +++ b/harbour/config/sunos/sunpro.cf @@ -65,7 +65,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 2af1debf2f..45d47f8ce2 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -36,7 +36,7 @@ endif LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o -LINKPATHS = -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) LINKLIBS += -lwininet -lws2 diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index 2b1dd70f34..04562dbaa4 100644 --- a/harbour/config/wce/msvcarm.cf +++ b/harbour/config/wce/msvcarm.cf @@ -49,17 +49,17 @@ else endif LD_OUT := -Fe -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 -endif -LINKPATHS += /libpath:$(LIB_DIR) +LINKPATHS := /libpath:$(LIB_DIR) # Add all libraries specified in LIBS. LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) -LDFLAGS = /nologo $(LINKPATHS) +LDFLAGS = /nologo /link +LDFLAGS += /subsystem:windowsce,4.20 /machine:arm /armpadcode /stack:65536,4096 /nodefaultlib:"oldnames.lib" +LDFLAGS += /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf +ifeq ($(HB_VISUALC_VER_PRE80),) + LDFLAGS += /manifest:no +endif +LDFLAGS += $(LINKPATHS) AR := lib.exe ARFLAGS := diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index 642f6b7544..b48451e298 100644 --- a/harbour/config/wce/poccarm.cf +++ b/harbour/config/wce/poccarm.cf @@ -40,7 +40,7 @@ LD := polink.exe LD_OUT := -OUT: # Add all libraries specified in LIBS. -LINKPATHS += -LIBPATH:$(LIB_DIR) +LINKPATHS := -LIBPATH:$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index c193056587..57040a5fdd 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -37,7 +37,7 @@ LD := bcc32.exe LD_OUT := -e # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) # It's probably not necessary in native Windows but I need it # for my Linux box because -L seems to not work with WINE LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT)) diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index a52bfb8667..6fcc6cdf13 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -36,7 +36,7 @@ LD := $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. -LINKPATHS += -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf index cd4a34b325..69d42190ce 100644 --- a/harbour/config/win/icc.cf +++ b/harbour/config/win/icc.cf @@ -41,10 +41,10 @@ LD := icl.exe LD_OUT := -Fe # Add all libraries specified in LIBS. -LINKPATHS += /link /libpath:$(LIB_DIR) +LINKPATHS := /libpath:$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) -LDFLAGS = $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib +LDFLAGS = /link $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib AR := xilib.exe ARFLAGS := diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 4021f72548..53900f37a1 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -38,7 +38,7 @@ endif LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o -LINKPATHS = -L$(LIB_DIR) +LINKPATHS := -L$(LIB_DIR) LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) # Add the standard C main() entry diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index 259c7f361d..12dace526c 100644 --- a/harbour/config/win/msvc.cf +++ b/harbour/config/win/msvc.cf @@ -52,7 +52,7 @@ LD := link.exe LD_OUT := /out: # Add all libraries specified in LIBS. -LINKPATHS = /libpath:$(LIB_DIR) +LINKPATHS := /libpath:$(LIB_DIR) LINKLIBS = $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index f580fdcf6d..03753447ca 100644 --- a/harbour/config/win/pocc.cf +++ b/harbour/config/win/pocc.cf @@ -37,7 +37,7 @@ LD := polink.exe LD_OUT := -OUT: # Add all libraries specified in LIBS. -LINKPATHS += -LIBPATH:$(LIB_DIR) +LINKPATHS := -LIBPATH:$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index ae7c063bab..167c12ea2c 100644 --- a/harbour/config/win/xcc.cf +++ b/harbour/config/win/xcc.cf @@ -31,7 +31,7 @@ LD := xlink.exe LD_OUT := -OUT: # Add all libraries specified in LIBS. -LINKPATHS += -LIBPATH:$(LIB_DIR) +LINKPATHS := -LIBPATH:$(LIB_DIR) LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib