From 788ed22d9368df80caba781945d87ea11541dfc2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Feb 2011 14:55:12 +0000
Subject: [PATCH] 2011-02-22 15:53 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * src/dynlib/2nd/Makefile   * src/dynlib/Makefile   *
 config/none.mk   * config/dyn.mk     % Dropped DYNNAME. Now using DYNNAME2
 only.     % Dropped HB_DYNLIB_NAME*. Now using HB_DYNLIB_BASE* only.     ;
 TODO: Rename DYNNAME2 to DYNNAME, rename HB_DYNLIB_BASE* to HB_DYNLIB_NAME*.

---
 harbour/ChangeLog               | 9 +++++++++
 harbour/config/dyn.mk           | 6 +++---
 harbour/config/none.mk          | 4 ++--
 harbour/src/dynlib/2nd/Makefile | 1 -
 harbour/src/dynlib/Makefile     | 1 -
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ba49bc319b..5555045de0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-22 15:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/dynlib/2nd/Makefile
+  * src/dynlib/Makefile
+  * config/none.mk
+  * config/dyn.mk
+    % Dropped DYNNAME. Now using DYNNAME2 only.
+    % Dropped HB_DYNLIB_NAME*. Now using HB_DYNLIB_BASE* only.
+    ; TODO: Rename DYNNAME2 to DYNNAME, rename HB_DYNLIB_BASE* to HB_DYNLIB_NAME*.
+
 2011-02-22 14:20 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/src/rtl/fscopy.c
     * rewrote using hb_fsOpen()/hb_fsCreate() as requested by Viktor
diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk
index 09f6b04535..4f1c9f05b8 100644
--- a/harbour/config/dyn.mk
+++ b/harbour/config/dyn.mk
@@ -10,7 +10,7 @@ ifneq ($(HB_COMPILER),)
 HB_LINKING_RTL :=
 HB_LINKING_VMMT :=
 
-ifneq ($(DYNNAME),)
+ifneq ($(DYNNAME2),)
    HB_LINKING_RTL := yes
    ifneq ($(findstring vmmt, $(DYNDIRLIST)),)
       HB_LINKING_VMMT := yes
@@ -83,13 +83,13 @@ IMP_FILE :=
 ifneq ($(HB_BUILD_DYN),no)
 ifneq ($(DY_RULE),)
 
-DYN_NAME := $(DYN_PREF)$(DYNNAME)$(DYN_EXT)$(HB_DYNLIB_PEXT)
+DYN_NAME := $(DYN_PREF)$(DYNNAME2)$(HB_DYNLIB_POST)$(DYN_EXT)$(HB_DYNLIB_PEXT)
 DYN_FILE := $(DYN_DIR)/$(DYN_NAME)
 DYN_NAME2 := $(DYN_PREF)$(DYNNAME2)$(DYN_EXT)
 DYN_FILE2 := $(DYN_DIR)/$(DYN_NAME2)
 
 ifneq ($(IMP_DIR),)
-   IMP_NAME := $(LIB_PREF)$(DYNNAME)$(LIB_EXT)
+   IMP_NAME := $(LIB_PREF)$(DYNNAME2)$(HB_DYNLIB_POST)$(LIB_EXT)$(HB_DYNLIB_PEXT)
    IMP_FILE := $(IMP_DIR)/$(IMP_NAME)
 endif
 
diff --git a/harbour/config/none.mk b/harbour/config/none.mk
index 6f423bbf38..d2c74d221b 100644
--- a/harbour/config/none.mk
+++ b/harbour/config/none.mk
@@ -10,8 +10,8 @@ ifneq ($(HB_COMPILER),)
 ifneq ($(LIBNAME),)
    DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(LIBNAME)' library skipped $(if $(HB_SKIP_REASON),($(HB_SKIP_REASON)),)$(ECHOQUOTE)
 else
-ifneq ($(DYNNAME),)
-   DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(DYNNAME)' dynamic library skipped$(ECHOQUOTE)
+ifneq ($(DYNNAME2),)
+   DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(DYNNAME2)' dynamic library skipped$(ECHOQUOTE)
 else
    DIR_RULE :=
 endif
diff --git a/harbour/src/dynlib/2nd/Makefile b/harbour/src/dynlib/2nd/Makefile
index e8c5c226ea..22979a69e5 100644
--- a/harbour/src/dynlib/2nd/Makefile
+++ b/harbour/src/dynlib/2nd/Makefile
@@ -9,7 +9,6 @@ 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
diff --git a/harbour/src/dynlib/Makefile b/harbour/src/dynlib/Makefile
index ac4dd4dd0a..66ce1d4efc 100644
--- a/harbour/src/dynlib/Makefile
+++ b/harbour/src/dynlib/Makefile
@@ -9,7 +9,6 @@ include $(TOP)$(ROOT)config/global.mk
 ifneq ($(DYNDIRLIST_BASE),)
 
    DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
-   DYNNAME := $(HB_DYNLIB_NAME)
    DYNNAME2 := $(HB_DYNLIB_BASE)
 
    include $(TOP)$(ROOT)config/dyn.mk