From 8b5211b118aeac0c25dcc1f401b515f6d9f69582 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 31 Jul 2010 12:00:53 +0000
Subject: [PATCH] 2010-07-31 13:59 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbmysql/hbmysql.hbc   * contrib/gtalleg/gtalleg.hbc  
 * contrib/sddmy/sddmy.hbc   * contrib/hbodbc/hbodbc.hbc   *
 contrib/xhb/xhb.hbc   * contrib/sddfb/sddfb.hbc   *
 contrib/hbtpathy/hbtpathy.hbc   * contrib/hbgt/hbgt.hbc   *
 contrib/hbsqlit3/hbsqlit3.hbc   * contrib/hbblat/hbblat.hbc   *
 contrib/hbfbird/hbfbird.hbc   * contrib/sddpg/sddpg.hbc   *
 contrib/hbziparc/hbziparc.hbc   * contrib/hbbz2/hbbz2.hbc   *
 contrib/hbblink/hbblink.hbc   * contrib/hbnf/hbnf.hbc   *
 contrib/hbcurl/hbcurl.hbc   * contrib/hbmemio/hbmemio.hbc   *
 contrib/hbxpp/hbxpp.hbc   * contrib/hbfship/hbfship.hbc   *
 contrib/hbcups/hbcups.hbc   * contrib/hbfoxpro/hbfoxpro.hbc   *
 contrib/rddbmcdx/rddbmcdx.hbc   * contrib/hbhpdf/hbhpdf.hbc   *
 contrib/gtwvg/gtwvg.hbc   * contrib/hbpgsql/hbpgsql.hbc   *
 contrib/hbclipsm/hbclipsm.hbc   * contrib/rddads/rddads.hbc   *
 contrib/sddsqlt3/sddsqlt3.hbc   * contrib/hbfimage/hbfimage.hbc   *
 contrib/sddodbc/sddodbc.hbc   * contrib/hbgd/hbgd.hbc   *
 contrib/hbmisc/hbmisc.hbc   * contrib/sddoci/sddoci.hbc   *
 contrib/hbcomm/hbcomm.hbc   * contrib/hbcairo/hbcairo.hbc   *
 contrib/hbsms/hbsms.hbc     + Added ${__HB_DYN__} to main lib libs= entry.
 This way the shared       lib flavor can be selected to experiment with it.  
     (use '-env:__HB_DYN__=_dll' hbmk2 option)

---
 harbour/ChangeLog                     | 44 ++++++++++++++++++++++++++-
 harbour/contrib/gtalleg/gtalleg.hbc   |  4 +--
 harbour/contrib/gtwvg/gtwvg.hbc       |  2 +-
 harbour/contrib/hbblat/hbblat.hbc     |  2 +-
 harbour/contrib/hbblink/hbblink.hbc   |  2 +-
 harbour/contrib/hbbz2/hbbz2.hbc       |  2 +-
 harbour/contrib/hbcairo/hbcairo.hbc   |  2 +-
 harbour/contrib/hbclipsm/hbclipsm.hbc |  2 +-
 harbour/contrib/hbcomm/hbcomm.hbc     |  2 +-
 harbour/contrib/hbcups/hbcups.hbc     |  2 +-
 harbour/contrib/hbcurl/hbcurl.hbc     |  4 +--
 harbour/contrib/hbfbird/hbfbird.hbc   |  2 +-
 harbour/contrib/hbfimage/hbfimage.hbc |  2 +-
 harbour/contrib/hbfoxpro/hbfoxpro.hbc |  2 +-
 harbour/contrib/hbfship/hbfship.hbc   |  2 +-
 harbour/contrib/hbgd/hbgd.hbc         |  2 +-
 harbour/contrib/hbgt/hbgt.hbc         |  2 +-
 harbour/contrib/hbhpdf/hbhpdf.hbc     |  2 +-
 harbour/contrib/hbmemio/hbmemio.hbc   |  2 +-
 harbour/contrib/hbmisc/hbmisc.hbc     |  2 +-
 harbour/contrib/hbmysql/hbmysql.hbc   |  2 +-
 harbour/contrib/hbnf/hbnf.hbc         |  2 +-
 harbour/contrib/hbodbc/hbodbc.hbc     |  2 +-
 harbour/contrib/hbpgsql/hbpgsql.hbc   |  2 +-
 harbour/contrib/hbsms/hbsms.hbc       |  2 +-
 harbour/contrib/hbsqlit3/hbsqlit3.hbc |  2 +-
 harbour/contrib/hbtpathy/hbtpathy.hbc |  2 +-
 harbour/contrib/hbxpp/hbxpp.hbc       |  2 +-
 harbour/contrib/hbziparc/hbziparc.hbc |  2 +-
 harbour/contrib/rddads/rddads.hbc     |  2 +-
 harbour/contrib/rddbmcdx/rddbmcdx.hbc |  2 +-
 harbour/contrib/sddfb/sddfb.hbc       |  2 +-
 harbour/contrib/sddmy/sddmy.hbc       |  2 +-
 harbour/contrib/sddoci/sddoci.hbc     |  2 +-
 harbour/contrib/sddodbc/sddodbc.hbc   |  2 +-
 harbour/contrib/sddpg/sddpg.hbc       |  2 +-
 harbour/contrib/sddsqlt3/sddsqlt3.hbc |  2 +-
 harbour/contrib/xhb/xhb.hbc           |  2 +-
 38 files changed, 82 insertions(+), 40 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3c587f184b..090f788952 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,48 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-31 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmysql/hbmysql.hbc
+  * contrib/gtalleg/gtalleg.hbc
+  * contrib/sddmy/sddmy.hbc
+  * contrib/hbodbc/hbodbc.hbc
+  * contrib/xhb/xhb.hbc
+  * contrib/sddfb/sddfb.hbc
+  * contrib/hbtpathy/hbtpathy.hbc
+  * contrib/hbgt/hbgt.hbc
+  * contrib/hbsqlit3/hbsqlit3.hbc
+  * contrib/hbblat/hbblat.hbc
+  * contrib/hbfbird/hbfbird.hbc
+  * contrib/sddpg/sddpg.hbc
+  * contrib/hbziparc/hbziparc.hbc
+  * contrib/hbbz2/hbbz2.hbc
+  * contrib/hbblink/hbblink.hbc
+  * contrib/hbnf/hbnf.hbc
+  * contrib/hbcurl/hbcurl.hbc
+  * contrib/hbmemio/hbmemio.hbc
+  * contrib/hbxpp/hbxpp.hbc
+  * contrib/hbfship/hbfship.hbc
+  * contrib/hbcups/hbcups.hbc
+  * contrib/hbfoxpro/hbfoxpro.hbc
+  * contrib/rddbmcdx/rddbmcdx.hbc
+  * contrib/hbhpdf/hbhpdf.hbc
+  * contrib/gtwvg/gtwvg.hbc
+  * contrib/hbpgsql/hbpgsql.hbc
+  * contrib/hbclipsm/hbclipsm.hbc
+  * contrib/rddads/rddads.hbc
+  * contrib/sddsqlt3/sddsqlt3.hbc
+  * contrib/hbfimage/hbfimage.hbc
+  * contrib/sddodbc/sddodbc.hbc
+  * contrib/hbgd/hbgd.hbc
+  * contrib/hbmisc/hbmisc.hbc
+  * contrib/sddoci/sddoci.hbc
+  * contrib/hbcomm/hbcomm.hbc
+  * contrib/hbcairo/hbcairo.hbc
+  * contrib/hbsms/hbsms.hbc
+    + Added ${__HB_DYN__} to main lib libs= entry. This way the shared
+      lib flavor can be selected to experiment with it.
+      (use '-env:__HB_DYN__=_dll' hbmk2 option)
+
 2010-07-31 13:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
     % Code consolidation.
@@ -95,7 +137,7 @@
       symbols at link. Maybe this is not the right fix, go figure.
       (HB_STATIC_QT mode still has to be checked)
 
-  ; TODO: Add ${__HB_DYN__} to all .hbc files.
+  ; TODO: Add ${__HB_DYN__} to all .hbc files. [DONE]
 
 2010-07-31 02:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/Makefile
diff --git a/harbour/contrib/gtalleg/gtalleg.hbc b/harbour/contrib/gtalleg/gtalleg.hbc
index ca6f203f7d..29048d2615 100644
--- a/harbour/contrib/gtalleg/gtalleg.hbc
+++ b/harbour/contrib/gtalleg/gtalleg.hbc
@@ -2,8 +2,8 @@
 # $Id$
 #
 
-{!HB_STATIC_ALLEGRO}libs=${hb_name}
-{HB_STATIC_ALLEGRO}libs=${hb_name}s
+{!HB_STATIC_ALLEGRO}libs=${hb_name}${__HB_DYN__}
+{HB_STATIC_ALLEGRO}libs=${hb_name}s${__HB_DYN__}
 
 {!HB_STATIC_ALLEGRO&win}libs=alleg42
 {!HB_STATIC_ALLEGRO&linux}ldflags="`allegro-config --libs 2>/dev/null`"
diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc
index e74b747985..ed23e3d906 100644
--- a/harbour/contrib/gtwvg/gtwvg.hbc
+++ b/harbour/contrib/gtwvg/gtwvg.hbc
@@ -6,7 +6,7 @@ skip={!win}
 
 incpaths=.
 
-gt={hb_name}
+gt={hb_name}${__HB_DYN__}
 
 libs=../hbwin/hbwin.hbc
 
diff --git a/harbour/contrib/hbblat/hbblat.hbc b/harbour/contrib/hbblat/hbblat.hbc
index 2b5a1dd307..526a8b0748 100644
--- a/harbour/contrib/hbblat/hbblat.hbc
+++ b/harbour/contrib/hbblat/hbblat.hbc
@@ -6,5 +6,5 @@ skip={!win}
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=blat
diff --git a/harbour/contrib/hbblink/hbblink.hbc b/harbour/contrib/hbblink/hbblink.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbblink/hbblink.hbc
+++ b/harbour/contrib/hbblink/hbblink.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbbz2/hbbz2.hbc b/harbour/contrib/hbbz2/hbbz2.hbc
index df400dc512..eb34f2a302 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbc
+++ b/harbour/contrib/hbbz2/hbbz2.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=bz2
diff --git a/harbour/contrib/hbcairo/hbcairo.hbc b/harbour/contrib/hbcairo/hbcairo.hbc
index 6735cc0fdd..53ba4cb3b5 100644
--- a/harbour/contrib/hbcairo/hbcairo.hbc
+++ b/harbour/contrib/hbcairo/hbcairo.hbc
@@ -6,5 +6,5 @@ incpaths=.
 
 libs=${hb_name}
 
-{!unix}libs=cairo
+{!unix}libs=cairo${__HB_DYN__}
 {unix}ldflags="`pkg-config --libs cairo`"
diff --git a/harbour/contrib/hbclipsm/hbclipsm.hbc b/harbour/contrib/hbclipsm/hbclipsm.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbclipsm/hbclipsm.hbc
+++ b/harbour/contrib/hbclipsm/hbclipsm.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbcomm/hbcomm.hbc b/harbour/contrib/hbcomm/hbcomm.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbcomm/hbcomm.hbc
+++ b/harbour/contrib/hbcomm/hbcomm.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbcups/hbcups.hbc b/harbour/contrib/hbcups/hbcups.hbc
index ded1fbf4fb..8d9f555079 100644
--- a/harbour/contrib/hbcups/hbcups.hbc
+++ b/harbour/contrib/hbcups/hbcups.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 
 {unix}libs=cups
diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc
index d099ab853a..5c3942a8b6 100644
--- a/harbour/contrib/hbcurl/hbcurl.hbc
+++ b/harbour/contrib/hbcurl/hbcurl.hbc
@@ -4,8 +4,8 @@
 
 incpaths=.
 
-{!HB_STATIC_CURL}libs=${hb_name}
-{HB_STATIC_CURL}libs=${hb_name}s
+{!HB_STATIC_CURL}libs=${hb_name}${__HB_DYN__}
+{HB_STATIC_CURL}libs=${hb_name}s${__HB_DYN__}
 
 {!mingw}libs=libcurl
 {!HB_STATIC_CURL&mingw}libs=curldll
diff --git a/harbour/contrib/hbfbird/hbfbird.hbc b/harbour/contrib/hbfbird/hbfbird.hbc
index 991a42ecc8..d817d0e70f 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbc
+++ b/harbour/contrib/hbfbird/hbfbird.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=fbclient
diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/harbour/contrib/hbfimage/hbfimage.hbc
index ddf5e02100..9073414b92 100644
--- a/harbour/contrib/hbfimage/hbfimage.hbc
+++ b/harbour/contrib/hbfimage/hbfimage.hbc
@@ -6,5 +6,5 @@ skip={dos}
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=freeimage
diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbc b/harbour/contrib/hbfoxpro/hbfoxpro.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbfoxpro/hbfoxpro.hbc
+++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbfship/hbfship.hbc b/harbour/contrib/hbfship/hbfship.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbfship/hbfship.hbc
+++ b/harbour/contrib/hbfship/hbfship.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc
index 733f3db2ff..ddfda2550f 100644
--- a/harbour/contrib/hbgd/hbgd.hbc
+++ b/harbour/contrib/hbgd/hbgd.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-{!hbdyn}libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=bgd
 {linux}libs=gdlib png jpeg freetype m
 {darwin}libs=gd
diff --git a/harbour/contrib/hbgt/hbgt.hbc b/harbour/contrib/hbgt/hbgt.hbc
index 1763330ae6..86f6254c46 100644
--- a/harbour/contrib/hbgt/hbgt.hbc
+++ b/harbour/contrib/hbgt/hbgt.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbc b/harbour/contrib/hbhpdf/hbhpdf.hbc
index 7e2bc67996..9f5a214632 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbc
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=libhpdf
 libs=png
diff --git a/harbour/contrib/hbmemio/hbmemio.hbc b/harbour/contrib/hbmemio/hbmemio.hbc
index 1763330ae6..86f6254c46 100644
--- a/harbour/contrib/hbmemio/hbmemio.hbc
+++ b/harbour/contrib/hbmemio/hbmemio.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbmisc/hbmisc.hbc b/harbour/contrib/hbmisc/hbmisc.hbc
index 1763330ae6..86f6254c46 100644
--- a/harbour/contrib/hbmisc/hbmisc.hbc
+++ b/harbour/contrib/hbmisc/hbmisc.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/harbour/contrib/hbmysql/hbmysql.hbc
index 599f87b480..297f152132 100644
--- a/harbour/contrib/hbmysql/hbmysql.hbc
+++ b/harbour/contrib/hbmysql/hbmysql.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
diff --git a/harbour/contrib/hbnf/hbnf.hbc b/harbour/contrib/hbnf/hbnf.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbnf/hbnf.hbc
+++ b/harbour/contrib/hbnf/hbnf.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbodbc/hbodbc.hbc b/harbour/contrib/hbodbc/hbodbc.hbc
index fca1cc8943..80c08fd21c 100644
--- a/harbour/contrib/hbodbc/hbodbc.hbc
+++ b/harbour/contrib/hbodbc/hbodbc.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=odbc32
diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/harbour/contrib/hbpgsql/hbpgsql.hbc
index ebde05f1cc..0442e1189b 100644
--- a/harbour/contrib/hbpgsql/hbpgsql.hbc
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=pq
 {!unix}libs=libpq
diff --git a/harbour/contrib/hbsms/hbsms.hbc b/harbour/contrib/hbsms/hbsms.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbsms/hbsms.hbc
+++ b/harbour/contrib/hbsms/hbsms.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
index 6839346b8f..540f95f6b8 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbc
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=sqlite3
diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbtpathy/hbtpathy.hbc
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbxpp/hbxpp.hbc b/harbour/contrib/hbxpp/hbxpp.hbc
index d73afd134a..29bd564988 100644
--- a/harbour/contrib/hbxpp/hbxpp.hbc
+++ b/harbour/contrib/hbxpp/hbxpp.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbziparc/hbziparc.hbc b/harbour/contrib/hbziparc/hbziparc.hbc
index 3269b0e535..a02fc4d200 100644
--- a/harbour/contrib/hbziparc/hbziparc.hbc
+++ b/harbour/contrib/hbziparc/hbziparc.hbc
@@ -2,5 +2,5 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=../hbmzip/hbmzip.hbc
diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc
index 27175df39a..b5f59b124b 100644
--- a/harbour/contrib/rddads/rddads.hbc
+++ b/harbour/contrib/rddads/rddads.hbc
@@ -6,6 +6,6 @@ skip={!(linux|win)}
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=ace32
 {linux}libs=ace
diff --git a/harbour/contrib/rddbmcdx/rddbmcdx.hbc b/harbour/contrib/rddbmcdx/rddbmcdx.hbc
index 1763330ae6..86f6254c46 100644
--- a/harbour/contrib/rddbmcdx/rddbmcdx.hbc
+++ b/harbour/contrib/rddbmcdx/rddbmcdx.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/sddfb/sddfb.hbc b/harbour/contrib/sddfb/sddfb.hbc
index 7bc0431f99..6057eff2a0 100644
--- a/harbour/contrib/sddfb/sddfb.hbc
+++ b/harbour/contrib/sddfb/sddfb.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=fbclient
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/sddmy/sddmy.hbc b/harbour/contrib/sddmy/sddmy.hbc
index 59f6e53a30..b14a1f3a7d 100644
--- a/harbour/contrib/sddmy/sddmy.hbc
+++ b/harbour/contrib/sddmy/sddmy.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
 
diff --git a/harbour/contrib/sddoci/sddoci.hbc b/harbour/contrib/sddoci/sddoci.hbc
index e95df60d98..3b829f1943 100644
--- a/harbour/contrib/sddoci/sddoci.hbc
+++ b/harbour/contrib/sddoci/sddoci.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {HB_WITH_OCILIB_WIDE}libs=ocilibw
 {HB_WITH_OCILIB_MIXED}libs=ocilibm
 {!HB_WITH_OCILIB_WIDE&!HB_WITH_OCILIB_MIXED}libs=ociliba
diff --git a/harbour/contrib/sddodbc/sddodbc.hbc b/harbour/contrib/sddodbc/sddodbc.hbc
index 9246575163..5b5348b7bf 100644
--- a/harbour/contrib/sddodbc/sddodbc.hbc
+++ b/harbour/contrib/sddodbc/sddodbc.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {win}libs=odbc32
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/sddpg/sddpg.hbc b/harbour/contrib/sddpg/sddpg.hbc
index 3c09af88a5..4426fc7fbc 100644
--- a/harbour/contrib/sddpg/sddpg.hbc
+++ b/harbour/contrib/sddpg/sddpg.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 {unix}libs=pq
 {!unix}libs=libpq
 
diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbc b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
index 2a082bc2cf..41f30bc1d7 100644
--- a/harbour/contrib/sddsqlt3/sddsqlt3.hbc
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 libs=sqlite3
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/xhb/xhb.hbc b/harbour/contrib/xhb/xhb.hbc
index 0d2274ffa2..fe0ca5d1c4 100644
--- a/harbour/contrib/xhb/xhb.hbc
+++ b/harbour/contrib/xhb/xhb.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
 
 # xhb has these as part of core, so we're adding them to emulate it.
 # They are not needed to use xhb lib itself.