From 75252aebc9369b498306b2f144ce12bb06a5a1d5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 19 Sep 2009 14:04:16 +0000
Subject: [PATCH] 2009-09-19 16:02 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/bin.mk     ! Fixed to leave sys libs for non-*nix
 systems in shared mode.     + Added support for win/watcom.

  * utils/hbmk2/Makefile
  * utils/hbrun/Makefile
    + Added extra core lib specs required in shared mode.
---
 harbour/ChangeLog            | 13 ++++++++++++-
 harbour/config/bin.mk        | 10 +++++++---
 harbour/utils/hbmk2/Makefile |  2 +-
 harbour/utils/hbrun/Makefile |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0e618f1f0c..0f3d86105d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 16:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/bin.mk
+    ! Fixed to leave sys libs for non-*nix systems in shared mode.
+    + Added support for win/watcom.
+
+  * utils/hbmk2/Makefile
+  * utils/hbrun/Makefile
+    + Added extra core lib specs required in shared mode.
+
 2009-09-19 15:54 UTC+0600 April White (april users.sourceforge.net)
   + examples/hbdoc2/
   + examples/hbdoc2/genhtml.prg
@@ -35,6 +44,7 @@
   * source/Makefile
   * config/global.mk
   * config/bin.mk
+  * INSTALL
     + Added experimental support for HB_BUILD_SHARED=yes setting,
       which tells GNU Make to create shared Harbour tool executables.
     ; TOFIX: watcom for sure needs to be fixed.
@@ -3010,6 +3020,7 @@
       TODO: make the same for watcom builds - I would like to leave it
             for Viktor because I'm not sure where exactly I should add it
             for new watcom .mk files to not break Viktor's build concept.
+            [DONE]
 
 2009-08-31 16:21 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/net.c
@@ -4649,7 +4660,7 @@
     + Added linux/watcom support for -shared mode. Experimental, it doesn't
       work due to 'invalid library file attribute'. Either the GNU Make
       generate .so is wrong, or it's wrongly specified, or else.
-      I hope something can continue watcom dynamic lib support.
+      I hope someone can continue watcom dynamic lib support.
     + Added quiet option for watcom linker commands.
     ! Fixed missing SYS directive in watcom/win targets which prevented
       using this target in cross-build scenarios.
diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk
index d94f532082..070c4cf8f4 100644
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -17,6 +17,8 @@ ifeq ($(HB_BUILD_SHARED),yes)
    ifneq ($(filter $(HB_PLATFORM),win wce),)
       ifneq ($(filter $(HB_COMPILER),mingw mingw64 mingwarm),)
          HB_LIBS_TPL += hbmainstd
+      else ifeq ($(HB_COMPILER),watcom)
+         HB_LDFLAGS += FILE $(LIB_DIR)/hbmainstd.lib
       else
          HB_LIBS_TPL += hbmainstd hbmainwin
       endif
@@ -84,9 +86,11 @@ endif
 
 -include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
 
-ifeq ($(HB_BUILD_SHARED),yes)
-   SYSLIBS :=
-   SYSLIBPATHS :=
+ifneq ($(HB_PLATFORM_UNIX),)
+   ifeq ($(HB_BUILD_SHARED),yes)
+      SYSLIBS :=
+      SYSLIBPATHS :=
+   endif
 endif
 
 include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile
index 975f3a121e..2f60f64a7f 100644
--- a/harbour/utils/hbmk2/Makefile
+++ b/harbour/utils/hbmk2/Makefile
@@ -13,6 +13,6 @@ PRG_SOURCES := \
 
 PRG_MAIN := hbmk2.prg
 
-LIBS = $(HB_LIBS_MT_NORDD)
+LIBS = hbcplr hbpp hbcommon $(HB_LIBS_MT_NORDD)
 
 include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
index 83b45cb7ca..2a5cf1699c 100644
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -13,6 +13,6 @@ PRG_SOURCES := \
 
 PRG_MAIN := hbrun.prg
 
-LIBS = $(HB_LIBS_ST_RDD)
+LIBS = hbcplr hbpp hbcommon $(HB_LIBS_ST_RDD)
 
 include $(TOP)$(ROOT)config/bin.mk