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

@@ -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

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
 

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

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

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