From 47d927670e64c23ea35540fa3495497071ef4622 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 21 Dec 2009 19:11:43 +0000
Subject: [PATCH] 2009-12-21 20:11 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/utils/hbmk2/hbmk2.prg     * added
 'clib3r' to linked library list in DOS OpenWatcom builds.       In pure C
 mode this library is not included automatically.     ! do not use version
 suffix for harbour shared library in DJGPP builds       to keep 8.3 plain DOS
 names (harbour[m].dxe)     ! added -U to DXE3GEN parameters

---
 harbour/ChangeLog             |  8 ++++++++
 harbour/utils/hbmk2/hbmk2.prg | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9df5ee5f62..3ee3904b03 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-21 20:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/hbmk2.prg
+    * added 'clib3r' to linked library list in DOS OpenWatcom builds.
+      In pure C mode this library is not included automatically.
+    ! do not use version suffix for harbour shared library in DJGPP builds
+      to keep 8.3 plain DOS names (harbour[m].dxe)
+    ! added -U to DXE3GEN parameters
+
 2009-12-21 16:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Enabled -shared support for dos/djgpp. Not tested.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e89c773eed..a268aa42c3 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2658,7 +2658,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cOpt_CompC += " {LC}"
          ENDIF
          cBin_Dyn := "dxe3gen"
-         cOpt_Dyn := "--whole-archive {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
+         cOpt_Dyn := "--whole-archive -U {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
          cBin_Link := cBin_CompC
          cOpt_Link := "{LO} {LA} {FL} {DL}{SCRIPT}"
          cLibPathPrefix := "-L"
@@ -2702,8 +2702,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( l_aLIBSYS, "pdcurses" )
          ENDIF
 
-         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cDL_Version_Alter + cLibExt,;
-                                                   "harbour" + cDL_Version_Alter + cLibExt ) }
+         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cLibExt,;
+                                                   "harbour" + cLibExt ) }
 
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
             cBin_Lib   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
@@ -2804,6 +2804,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          CASE hbmk[ _HBMK_cPLAT ] == "win"   ; cOpt_Dyn := "OP quiet SYS nt_dll {FD} NAME {OD} {LO} {DL} {LL} {LB} {LS}{SCRIPT}"
          CASE hbmk[ _HBMK_cPLAT ] == "os2"   ; cOpt_Dyn := "OP quiet SYS os2v2_dll {FD} NAME {OD} {LO} {DL} {LL} {LB} {LS}{SCRIPT}"
          ENDCASE
+         IF hbmk[ _HBMK_cPLAT ] == "dos"
+            /* workaround for not included automatically CLIB in pure C mode DOS builds */
+            cOpt_Link += " LIB clib3r"
+         ENDIF
          cBin_Lib := "wlib" + cCCEXT
          cOpt_Lib := "-q {FA} {OL} {LO}{SCRIPT}"
          cLibLibExt := cLibExt