From 948e47b81eebbe7a89d44d06bb54fa505e8150f4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Jul 2009 20:09:19 +0000
Subject: [PATCH] 2009-07-14 22:06 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * 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/os2/watcom.cf   * config/os2/gcc.cf   *
 config/sunos/gcc.cf   * config/bsd/gcc.cf   * config/wce/msvcarm.cf   *
 config/wce/mingwarm.cf   * config/wce/poccarm.cf     % Deleted CONTRIBS
 settings which could add extra libs to the       Harbour build process.
 Harbour build process shouldn't       rely on extra libs, so this is not
 necessary.

---
 harbour/ChangeLog              | 27 +++++++++++++++++++++++++++
 harbour/config/bsd/gcc.cf      |  3 +--
 harbour/config/darwin/gcc.cf   |  3 +--
 harbour/config/dos/djgpp.cf    |  3 +--
 harbour/config/dos/watcom.cf   |  2 --
 harbour/config/hpux/gcc.cf     |  3 +--
 harbour/config/linux/gcc.cf    |  3 +--
 harbour/config/linux/icc.cf    |  3 +--
 harbour/config/linux/watcom.cf |  2 --
 harbour/config/os2/gcc.cf      |  3 +--
 harbour/config/os2/watcom.cf   |  2 --
 harbour/config/sunos/gcc.cf    |  3 +--
 harbour/config/wce/mingwarm.cf |  3 +--
 harbour/config/wce/msvcarm.cf  |  3 +--
 harbour/config/wce/poccarm.cf  |  3 +--
 harbour/config/win/bcc.cf      |  3 +--
 harbour/config/win/cygwin.cf   |  3 +--
 harbour/config/win/icc.cf      |  3 +--
 harbour/config/win/mingw.cf    |  3 +--
 harbour/config/win/msvc.cf     |  3 +--
 harbour/config/win/pocc.cf     |  3 +--
 harbour/config/win/watcom.cf   |  2 --
 harbour/config/win/xcc.cf      |  3 +--
 23 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 40798566ca..5a7e1fddcc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,33 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 22:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * 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/os2/watcom.cf
+  * config/os2/gcc.cf
+  * config/sunos/gcc.cf
+  * config/bsd/gcc.cf
+  * config/wce/msvcarm.cf
+  * config/wce/mingwarm.cf
+  * config/wce/poccarm.cf
+    % Deleted CONTRIBS settings which could add extra libs to the
+      Harbour build process. Harbour build process shouldn't
+      rely on extra libs, so this is not necessary.
+
 2009-07-14 21:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/darwin/gcc.cf
   * config/dos/watcom.cf
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 1cd24aa994..2787411147 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
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
@@ -43,7 +43,6 @@ endif
 
 LINKLIBS += -Wl,--start-group
 
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index edc1e88734..5ccaf14ea4 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -48,14 +48,13 @@ endif
 LD = $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
 
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 8ed18c8373..ffe19acc71 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -35,13 +35,12 @@ LD = $(HB_CMP)
 LD_OUT = -o
 LDLIBS = -lm
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index 9173658f77..db3424371d 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -108,10 +108,8 @@ LDFLAGS := debug all $(LDFLAGS)
 endif
 
 ifeq ($(HB_LIB_COMPILE),)
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
 endif
 
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 6d4240ec03..90be5ded73 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -42,13 +42,12 @@ endif
 LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index adb9f62171..c2901125f8 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -49,7 +49,7 @@ endif
 LD = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
@@ -60,7 +60,6 @@ endif
 # untill we don't clean them
 LINKLIBS += -Wl,--start-group
 
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index 8ea3b0e443..9f5cf26cbf 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -43,7 +43,7 @@ endif
 LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
@@ -54,7 +54,6 @@ endif
 # untill we don't clean them
 LINKLIBS += -Wl,--start-group
 
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf
index 4cdb0a3488..d111735c05 100644
--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -73,10 +73,8 @@ LDFLAGS := debug all $(LDFLAGS)
 endif
 
 ifeq ($(HB_LIB_COMPILE),)
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
 endif
 
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 67a8b3d08a..7deff089b7 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -44,14 +44,13 @@ LDFLAGS +=$(TOP)$(ROOT)source/vm/$(ARCH_COMP)/mainpm.o
 endif
 endif
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
 #LINKLIBS += -Wl,-(
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index a8fa6f65c2..e34c6786a4 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -94,10 +94,8 @@ LDFLAGS := debug all $(LDFLAGS)
 endif
 
 ifeq ($(HB_LIB_COMPILE),)
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
 endif
 
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 6370ee17c5..d64b2ae14f 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -38,13 +38,12 @@ endif
 LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index 3085827efa..e887740768 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -38,14 +38,13 @@ LD_OUT = -o
 LINKPATHS =
 LDLIBS =
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
 
-LDLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf
index 5cddbd9366..ff1d8ac759 100644
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -60,8 +60,7 @@ LINKPATHS += /libpath:$(LIB_DIR)
 else
 LINKPATHS += /libpath:$(HB_LIB_COMPILE)
 endif
-# Add all libraries specified in CONTRIBS and LIBS.
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
+# Add all libraries specified in LIBS.
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf
index e001632cc8..f6ed511cc3 100644
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -42,13 +42,12 @@ CFLAGS =
 LD = polink.exe
 LD_OUT = -OUT:
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index d2abd644d6..a0669ec224 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -41,13 +41,12 @@ LD = bcc32.exe
 LDFLAGS = -O2
 LD_OUT = -e
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
-LIBLIST = $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
 LIBLIST += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index 1759f864b6..d8cae26f31 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -35,7 +35,7 @@ endif
 LD = $(HB_CMP)
 LD_OUT = -o
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
@@ -46,7 +46,6 @@ endif
 # cyclic dependencies, but I think it is not really necessary if the
 # libraries are kept in proper order.
 # LINKLIBS += -Wl,-(
-LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index ac2c7a423f..743180b864 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -40,13 +40,12 @@ endif
 LD = icl.exe
 LD_OUT = -Fe
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += /link /libpath:$(LIB_DIR)
 else
 LINKPATHS += /link /libpath:$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 98c96f8fb9..03e340a70d 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -40,14 +40,13 @@ LD_OUT = -o
 LINKPATHS =
 LDLIBS =
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
 
-LDLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index 972ac16c9b..ed4b965e0d 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -50,13 +50,12 @@ endif
 LD = link.exe
 LD_OUT = /out:
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += /libpath:$(LIB_DIR)
 else
 LINKPATHS += /libpath:$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index fc480c30bc..9a69339251 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -39,13 +39,12 @@ CFLAGS =
 LD = polink.exe
 LD_OUT = -OUT:
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf
index 7bcd91abb0..f095337d8d 100644
--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -97,10 +97,8 @@ LDFLAGS := debug all $(LDFLAGS)
 endif
 
 ifeq ($(HB_LIB_COMPILE),)
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
-   LINKLIBS = $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
 endif
 
diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf
index 728dd75c28..f380555028 100644
--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -33,13 +33,12 @@ endif
 LD = xlink.exe
 LD_OUT = -OUT:
 
-# Add all libraries specified in CONTRIBS and LIBS.
+# Add all libraries specified in LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
 endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.