From 5a4a075cce2cd3dcc934dfcb930f5e66daa13cf6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 11 Aug 2009 10:58:19 +0000 Subject: [PATCH] 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 --- harbour/ChangeLog | 29 +++++++++++++++++++++++++++++ harbour/config/bsd/gcc.cf | 16 ++++++++-------- harbour/config/darwin/gcc.cf | 18 +++++++++--------- harbour/config/dos/djgpp.cf | 6 +++--- harbour/config/dos/watcom.cf | 4 ++-- harbour/config/hpux/gcc.cf | 14 +++++++------- harbour/config/linux/gcc.cf | 16 ++++++++-------- harbour/config/linux/icc.cf | 16 ++++++++-------- harbour/config/linux/sunpro.cf | 16 ++++++++-------- harbour/config/linux/watcom.cf | 4 ++-- harbour/config/os2/gcc.cf | 10 +++++----- harbour/config/os2/watcom.cf | 4 ++-- harbour/config/rules.cf | 2 +- harbour/config/sunos/gcc.cf | 16 ++++++++-------- harbour/config/sunos/sunpro.cf | 16 ++++++++-------- harbour/config/wce/mingwarm.cf | 4 ++-- harbour/config/wce/msvcarm.cf | 2 +- harbour/config/wce/poccarm.cf | 2 +- harbour/config/win/bcc.cf | 2 +- harbour/config/win/cygwin.cf | 4 ++-- harbour/config/win/icc.cf | 2 +- harbour/config/win/mingw.cf | 6 +++--- harbour/config/win/msvc.cf | 2 +- harbour/config/win/pocc.cf | 2 +- harbour/config/win/watcom.cf | 4 ++-- harbour/config/win/xcc.cf | 2 +- 26 files changed, 124 insertions(+), 95 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2ac15ace1c..93f69b2a14 100644 --- 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. diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index e59d578fc1..69ef4b1cda 100644 --- 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) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 0fd2dc5446..ce2c3aeef0 100644 --- 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 := diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index c83d74952e..47fd31c577 100644 --- 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 diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index 8bd07d7740..7738012a54 100644 --- 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) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index d5cf864602..74de39b40c 100644 --- 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) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index b2dcc27e58..a457c481fe 100644 --- 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) diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 34af7b1dd6..ddd2437632 100644 --- 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) diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index f26ec7437b..45a72ee580 100644 --- 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) diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf index 5dc5ce21f1..7ca7bdd4bf 100644 --- 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 diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 9804e42917..f03c7db209 100644 --- 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 diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf index 6fd3097201..b7d4ebee96 100644 --- 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) diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index c907f54299..a8364b7088 100644 --- 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. diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 7212e61915..fbaf569222 100644 --- 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) diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index 2a20fe5d97..f28940dff9 100644 --- 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) diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 45d47f8ce2..d886d8bff7 100644 --- 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 diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index 04562dbaa4..61634cd19c 100644 --- 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" diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index b48451e298..7c47736814 100644 --- 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 diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 57040a5fdd..f95073ba4a 100644 --- 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 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) diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index 6fcc6cdf13..c9dee840f8 100644 --- 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) diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf index 69d42190ce..00cf791892 100644 --- 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 diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 53900f37a1..e160adf7e3 100644 --- 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) diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index 12dace526c..3710f06d6f 100644 --- 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 diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index 03753447ca..d8d8db3f8d 100644 --- 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 diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf index 493ada057f..43d782bd36 100644 --- 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) diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index 167c12ea2c..a97bcd9354 100644 --- 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