2009-08-11 12:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/rules.cf * 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/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 * Renamed internal variable: LINKLIBS -> LDLIBS
2009-08-11 10:58:19 +00:00
parent 61e4133d46
commit 5a4a075cce
26 changed files with 124 additions and 95 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,35 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-08-11 12:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/rules.cf
+  * 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/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
+    * Renamed internal variable:
+      LINKLIBS  -> LDLIBS
+
 2009-08-11 12:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbcurl/hbcurl.c
    ! Silenced recently reintrod warning.
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -35,24 +35,24 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o

 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS = $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS = $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library and other RTLs
 ifeq ($(HB_CRS_LIB),)
   HB_CRS_LIB := ncurses
 endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
   # In BSD, slang still needs curses :(
   ifeq ($(findstring gtcrs, $(LIBS)),)
-      LINKLIBS += -l$(HB_CRS_LIB)
+      LDLIBS += -l$(HB_CRS_LIB)
   endif
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
  #LINKPATHS += -L/usr/X11R6/lib64
   LINKPATHS += -L/usr/X11R6/lib
 endif
@@ -60,14 +60,14 @@ endif
 LINKPATHS += -L/usr/local/lib

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm
+LDLIBS += -lm

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -48,40 +48,40 @@ LD := $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o

 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS = $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS = $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library and other RTLs
 ifeq ($(HB_CRS_LIB),)
   HB_CRS_LIB := ncurses
 endif
 ifneq ($(findstring gtcrs, $(LIBS)),)
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
   # In BSD, slang still needs curses :(
   ifeq ($(findstring gtcrs, $(LIBS)),)
-      LINKLIBS += -l$(HB_CRS_LIB)
+      LDLIBS += -l$(HB_CRS_LIB)
   endif
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
   #LINKPATHS += -L/usr/X11R6/lib64
   LINKPATHS += -L/usr/X11R6/lib
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm
+LDLIBS += -lm

 LDFLAGS += $(LINKPATHS)
-LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS)
+LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS)

 AR := libtool
 ARFLAGS :=
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -36,8 +36,8 @@ LD_OUT := -o

 LINKPATHS := -L$(LIB_DIR)

-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
-LINKLIBS += -lm
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += -lm

 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every echo command will be separated by LF
@@ -66,7 +66,7 @@ define link_exe_file
@echo. $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(BIN_DIR)/$@ > __link__.tmp
 $(foreach file,$(^F),$(link_file))
 $(foreach file,$(LINKPATHS),$(link_file))
-$(foreach file,$(LINKLIBS),$(link_file))
+$(foreach file,$(LDLIBS),$(link_file))
 -$(LD) @__link__.tmp
 endef

--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -87,7 +87,7 @@ endef
 define link_exe_file
@echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp
 $(foreach file,$(^F),$(link_file))
-$(foreach lib,$(LINKLIBS),$(link_lib))
+$(foreach lib,$(LDLIBS),$(link_lib))
 -$(LD) @__link__.tmp
 endef

@@ -103,7 +103,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif

-LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS)

--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -44,33 +44,33 @@ LD_OUT := -o

 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := ncurses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
   #LINKPATHS += -L/usr/X11R6/lib64
   LINKPATHS += -L/usr/X11R6/lib
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt
+LDLIBS += -lm -lrt

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -52,38 +52,38 @@ LD_OUT := -o
 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)

-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library and other RTLs
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := ncurses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -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
+   LDLIBS += -lgpm
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt -ldl
+LDLIBS += -lm -lrt -ldl

 LDFLAGS = $(LINKPATHS)

--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -44,38 +44,38 @@ LD_OUT := -o
 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)

-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library and other RTLs
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := ncurses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -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
+   LDLIBS += -lgpm
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt -ldl
+LDLIBS += -lm -lrt -ldl

 LDFLAGS = $(LINKPATHS)

--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -56,37 +56,37 @@ LD_OUT := -o$(subst x,x, )

 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := ncurses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
   LINKPATHS += -L/usr/X11R6/lib
 endif

 # HB_GPM_MOUSE: use gpm mouse driver
 ifeq ($(HB_GPM_MOUSE),yes)
-   LINKLIBS += -lgpm
+   LDLIBS += -lgpm
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt -ldl
+LDLIBS += -lm -lrt -ldl

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -65,11 +65,11 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif

-LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 comma := ,
 LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(^F))
-LDLIBS_COMMA = $(subst $(subst x,x, ),$(comma) ,$(strip $(LINKLIBS)))
+LDLIBS_COMMA = $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS)))
 ifneq ($(HB_SHELL),sh)
   LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@. FILE $(LDFILES_COMMA)
 else
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -46,21 +46,21 @@ endif

 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(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
+         LDLIBS += -l$(HB_GT_LIB)
+         LDLIBS += -lgtos2
      endif
   endif
 endif

 # add socket library
-LINKLIBS += -lsocket
+LDLIBS += -lsocket

 # statical linking with GCC 3.2.2 libc as not require its presence on user system
 LDFLAGS += $(LINKPATHS)
@@ -68,7 +68,7 @@ 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 $@
+      LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS) & emxbind -ep $@
   endif
 endif

--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -69,11 +69,11 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif

-LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 comma := ,
 LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(^F))
-LDLIBS_COMMA = $(subst $(subst x,x, ),$(comma) ,$(strip $(LINKLIBS)))
+LDLIBS_COMMA = $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS)))
 LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),)

 ifeq ($(HB_SHELL),sh)
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -43,7 +43,7 @@ endif

 # The rule to link an executable.
 ifeq ($(LD_RULE),)
-   LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS)
+   LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS)
 endif

 # Eliminate these rules.
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -42,34 +42,34 @@ LD_OUT := -o

 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := curses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
   #LINKPATHS += -L/usr/X11R6/lib64
   LINKPATHS += -L/usr/X11R6/lib
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lpcre
+   LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-   LINKLIBS += -lz
+   LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt
-LINKLIBS += -lsocket -lnsl -lresolv
+LDLIBS += -lm -lrt
+LDLIBS += -lsocket -lnsl -lresolv

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/sunos/sunpro.cf
+++ b/harbour/config/sunos/sunpro.cf
@@ -66,33 +66,33 @@ LD_OUT := -o$(subst x,x, )

 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # Add the specified GT driver library
 ifneq ($(findstring gtcrs, $(LIBS)),)
   ifeq ($(HB_CRS_LIB),)
      HB_CRS_LIB := curses
   endif
-   LINKLIBS += -l$(HB_CRS_LIB)
+   LDLIBS += -l$(HB_CRS_LIB)
 endif
 ifneq ($(findstring gtsln, $(LIBS)),)
-   LINKLIBS += -lslang
+   LDLIBS += -lslang
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
-   LINKLIBS += -lX11
+   LDLIBS += -lX11
   LINKPATHS += -L/usr/X11R6/lib
 endif

 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lpcre
+LDLIBS += -lpcre
 endif

 ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
-LINKLIBS += -lz
+LDLIBS += -lz
 endif

-LINKLIBS += -lm -lrt
-LINKLIBS += -lsocket -lnsl -lresolv
+LDLIBS += -lm -lrt
+LDLIBS += -lsocket -lnsl -lresolv

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -37,9 +37,9 @@ LD := $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o

 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS = $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS = $(foreach lib,$(LIBS),-l$(lib))

-LINKLIBS += -lwininet -lws2
+LDLIBS += -lwininet -lws2
 LDFLAGS += $(LINKPATHS)

 RANLIB := $(HB_CCPREFIX)ranlib
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -51,7 +51,7 @@ LD_OUT := -Fe

 LINKPATHS := /libpath:$(LIB_DIR)
 # Add all libraries specified in LIBS.
-LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = /nologo /link
 LDFLAGS += /subsystem:windowsce,4.20 /machine:arm /armpadcode /stack:65536,4096 /nodefaultlib:"oldnames.lib"
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -41,7 +41,7 @@ LD_OUT := -OUT:

 # Add all libraries specified in LIBS.
 LINKPATHS := -LIBPATH:$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib
 LDFLAGS += /SUBSYSTEM:WINDOWS
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -40,7 +40,7 @@ LD_OUT := -e
 LINKPATHS := -L$(LIB_DIR)
 # It's probably not necessary in native Windows but I need it
 # for my Linux box because -L<path> seems to not work with WINE
-LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
+LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -38,10 +38,10 @@ LD_OUT := -o
 # Add all libraries specified in LIBS.
 LINKPATHS := -L$(LIB_DIR)

-LINKLIBS += $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS += $(foreach lib,$(LIBS),-l$(lib))

 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
-LINKLIBS += -luser32 -lgdi32 -lws2_32
+LDLIBS += -luser32 -lgdi32 -lws2_32

 LDFLAGS = $(LINKPATHS)

--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -42,7 +42,7 @@ LD_OUT := -Fe

 # Add all libraries specified in LIBS.
 LINKPATHS := /libpath:$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = /link $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib

--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -39,16 +39,16 @@ LD := $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o

 LINKPATHS := -L$(LIB_DIR)
-LINKLIBS = $(foreach lib,$(LIBS),-l$(lib))
+LDLIBS = $(foreach lib,$(LIBS),-l$(lib))

 # Add the standard C main() entry
 ifeq ($(HB_MAIN),std)
   ifeq ($(findstring hbvm,$(LIBS)),hbvm)
-      LINKLIBS += -lhbmainstd
+      LDLIBS += -lhbmainstd
   endif
 endif

-LINKLIBS += -luser32 -lgdi32 -lws2_32
+LDLIBS += -luser32 -lgdi32 -lws2_32

 LDFLAGS += $(LINKPATHS)

--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -53,7 +53,7 @@ LD_OUT := /out:

 # Add all libraries specified in LIBS.
 LINKPATHS := /libpath:$(LIB_DIR)
-LINKLIBS = $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS = $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib

--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -38,7 +38,7 @@ LD_OUT := -OUT:

 # Add all libraries specified in LIBS.
 LINKPATHS := -LIBPATH:$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
 LDFLAGS += /SUBSYSTEM:CONSOLE
--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -81,7 +81,7 @@ endef
 define link_exe_file
@echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp
 $(foreach file,$(^F),$(link_file))
-$(foreach lib,$(LINKLIBS),$(link_lib))
+$(foreach lib,$(LDLIBS),$(link_lib))
@echo LIB ws2_32.lib >> __link__.tmp
 -$(LD) @__link__.tmp
 endef
@@ -92,7 +92,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
   LDFLAGS := DEBUG ALL $(LDFLAGS)
 endif

-LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))

 LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS)

--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -32,7 +32,7 @@ LD_OUT := -OUT:

 # Add all libraries specified in LIBS.
 LINKPATHS := -LIBPATH:$(LIB_DIR)
-LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
+LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))

 LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib