From 0703b5799dacf70be38efb38acf11b4bdc895270 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 13 Feb 2011 12:47:03 +0000
Subject: [PATCH] 2011-02-13 13:43 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk   * src/dynlib/Makefile   + src/dynlib/2nd  
 + src/dynlib/2nd/Makefile     * Changed so that _HB_BUILD_DYN_ST=yes now
 creates a separate,       secondary dll in ST mode, called
 harbourst/harbours.

---
 harbour/ChangeLog               |  8 ++++++++
 harbour/config/global.mk        | 26 +++++++++++++++++---------
 harbour/src/dynlib/2nd/Makefile | 31 +++++++++++++++++++++++++++++++
 harbour/src/dynlib/Makefile     | 11 ++++++-----
 4 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 harbour/src/dynlib/2nd/Makefile

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5c6a174390..70129904ac 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-13 13:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * src/dynlib/Makefile
+  + src/dynlib/2nd
+  + src/dynlib/2nd/Makefile
+    * Changed so that _HB_BUILD_DYN_ST=yes now creates a separate,
+      secondary dll in ST mode, called harbourst/harbours.
+
 2011-02-13 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmzip/3rd/minizip/minizip.dif
   * contrib/hbmzip/3rd/minizip/ioapi.h
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 658f41481e..e154c99910 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1755,9 +1755,13 @@ ifeq ($(HB_INIT_DONE),)
 
       ifeq ($(HB_PLATFORM),darwin)
          DYNNAME_POST := .$(HB_DYN_VER)
+      else
+      ifneq ($(filter $(HB_PLATFORM),dos os2),)
+         DYNNAME_POST :=
       else
          DYNNAME_POST := -$(HB_DYN_VER)
       endif
+      endif
 
       ifeq ($(HB_PLATFORM),win)
          ifeq ($(HB_COMPILER),bcc)
@@ -1793,18 +1797,22 @@ ifeq ($(HB_INIT_DONE),)
       endif
 
       HB_DYNLIB_BASE := harbour
-      ifeq ($(HB_PLATFORM),dos)
-         HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
-      else
-      ifeq ($(HB_PLATFORM),os2)
-         HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
-      else
-         HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)$(DYNNAME_POST)
-      endif
-      endif
+      HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)$(DYNNAME_POST)
 
       export HB_DYNLIB_BASE
       export HB_DYNLIB_NAME
+
+      ifeq ($(_HB_BUILD_DYN_ST),yes)
+         ifneq ($(filter $(HB_PLATFORM),dos os2),)
+            HB_DYNLIB_BASE_2ND := harbours
+         else
+            HB_DYNLIB_BASE_2ND := harbourst
+         endif
+         HB_DYNLIB_NAME_2ND := $(HB_DYNLIB_BASE_2ND)$(DYNNAME_POST)
+
+         export HB_DYNLIB_BASE_2ND
+         export HB_DYNLIB_NAME_2ND
+      endif
    endif
 endif
 
diff --git a/harbour/src/dynlib/2nd/Makefile b/harbour/src/dynlib/2nd/Makefile
new file mode 100644
index 0000000000..e8c5c226ea
--- /dev/null
+++ b/harbour/src/dynlib/2nd/Makefile
@@ -0,0 +1,31 @@
+#
+# $Id$
+#
+
+ROOT := ../../../
+
+include $(TOP)$(ROOT)config/global.mk
+
+ifneq ($(DYNDIRLIST_BASE),)
+
+   DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm
+   DYNNAME := $(HB_DYNLIB_NAME_2ND)
+   DYNNAME2 := $(HB_DYNLIB_BASE_2ND)
+
+   include $(TOP)$(ROOT)config/dyn.mk
+
+   ifneq ($(INSTALL_RULE_DYN),)
+      ifneq ($(HB_INSTALL_LIB),)
+         ifneq ($(IMP_FILE),)
+            INSTALL_FILES := $(IMP_FILE)
+            INSTALL_DIR := $(HB_INSTALL_LIB)
+            include $(TOP)$(ROOT)config/install.mk
+         endif
+      endif
+   else
+      include $(TOP)$(ROOT)config/none.mk
+   endif
+else
+   $(warning ! Warning: Please run make from one level up)
+   include $(TOP)$(ROOT)config/none.mk
+endif
diff --git a/harbour/src/dynlib/Makefile b/harbour/src/dynlib/Makefile
index a71a22fdd4..ac4dd4dd0a 100644
--- a/harbour/src/dynlib/Makefile
+++ b/harbour/src/dynlib/Makefile
@@ -8,16 +8,17 @@ include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(DYNDIRLIST_BASE),)
 
-   ifeq ($(_HB_BUILD_DYN_ST),yes)
-      DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm
-   else
-      DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
-   endif
+   DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
    DYNNAME := $(HB_DYNLIB_NAME)
    DYNNAME2 := $(HB_DYNLIB_BASE)
 
    include $(TOP)$(ROOT)config/dyn.mk
 
+   ifeq ($(_HB_BUILD_DYN_ST),yes)
+      DIRS := 2nd
+      include $(TOP)$(ROOT)config/dir.mk
+   endif
+
    ifneq ($(INSTALL_RULE_DYN),)
       ifneq ($(HB_INSTALL_LIB),)
          ifneq ($(IMP_FILE),)