From 7b2883a9e3d229e0467cef565702498d83aa4a03 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 22 Feb 2011 15:01:39 +0000 Subject: [PATCH] 2011-02-22 16:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/dynlib/2nd/Makefile * src/dynlib/Makefile * config/none.mk * config/vxworks/gcc.mk * config/vxworks/diab.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/darwin/clang.mk * config/linux/gcc.mk * config/dyn.mk * config/os2/gcc.mk * DYNNAME2 -> DYNNAME --- harbour/ChangeLog | 16 +++++++++++++++- harbour/config/darwin/clang.mk | 2 +- harbour/config/darwin/gcc.mk | 2 +- harbour/config/darwin/icc.mk | 4 ++-- harbour/config/dyn.mk | 8 ++++---- harbour/config/linux/gcc.mk | 2 +- harbour/config/none.mk | 4 ++-- harbour/config/os2/gcc.mk | 2 +- harbour/config/vxworks/diab.mk | 2 +- harbour/config/vxworks/gcc.mk | 2 +- harbour/src/dynlib/2nd/Makefile | 2 +- harbour/src/dynlib/Makefile | 2 +- 12 files changed, 31 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5555045de0..b9f592de93 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-22 16:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/dynlib/2nd/Makefile + * src/dynlib/Makefile + * config/none.mk + * config/vxworks/gcc.mk + * config/vxworks/diab.mk + * config/darwin/gcc.mk + * config/darwin/icc.mk + * config/darwin/clang.mk + * config/linux/gcc.mk + * config/dyn.mk + * config/os2/gcc.mk + * DYNNAME2 -> DYNNAME + 2011-02-22 15:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/dynlib/2nd/Makefile * src/dynlib/Makefile @@ -23,7 +37,7 @@ * 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*. + ; TODO: Rename DYNNAME2 to DYNNAME. [DONE] 2011-02-22 14:20 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/src/rtl/fscopy.c diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk index 5d58b0e52e..4d9c3d49c1 100644 --- a/harbour/config/darwin/clang.mk +++ b/harbour/config/darwin/clang.mk @@ -61,6 +61,6 @@ DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib)) -DY_RULE = $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME2)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) +DY_RULE = $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk index b3567460e0..a793c4e60f 100644 --- a/harbour/config/darwin/gcc.mk +++ b/harbour/config/darwin/gcc.mk @@ -65,6 +65,6 @@ DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib)) -DY_RULE = $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME2)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) +DY_RULE = $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk index 28198333cd..47a3a64987 100644 --- a/harbour/config/darwin/icc.mk +++ b/harbour/config/darwin/icc.mk @@ -56,9 +56,9 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dynlib_object)) - $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME2)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -filelist __dyn__.tmp $(DLIBS) $(DYSTRIP) + $(DY) $(DFLAGS) -install_name "$(LIB_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -filelist __dyn__.tmp $(DLIBS) $(DYSTRIP) $(LN) $(@F) $(DYN_FILE2) - $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) + $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk index 4f1c9f05b8..0737cd4f88 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 ($(DYNNAME2),) +ifneq ($(DYNNAME),) 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)$(DYNNAME2)$(HB_DYNLIB_POST)$(DYN_EXT)$(HB_DYNLIB_PEXT) +DYN_NAME := $(DYN_PREF)$(DYNNAME)$(HB_DYNLIB_POST)$(DYN_EXT)$(HB_DYNLIB_PEXT) DYN_FILE := $(DYN_DIR)/$(DYN_NAME) -DYN_NAME2 := $(DYN_PREF)$(DYNNAME2)$(DYN_EXT) +DYN_NAME2 := $(DYN_PREF)$(DYNNAME)$(DYN_EXT) DYN_FILE2 := $(DYN_DIR)/$(DYN_NAME2) ifneq ($(IMP_DIR),) - IMP_NAME := $(LIB_PREF)$(DYNNAME2)$(HB_DYNLIB_POST)$(LIB_EXT)$(HB_DYNLIB_PEXT) + IMP_NAME := $(LIB_PREF)$(DYNNAME)$(HB_DYNLIB_POST)$(LIB_EXT)$(HB_DYNLIB_PEXT) IMP_FILE := $(IMP_DIR)/$(IMP_NAME) endif diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index 0b76669c1d..f2b2e87284 100644 --- a/harbour/config/linux/gcc.mk +++ b/harbour/config/linux/gcc.mk @@ -55,6 +55,6 @@ DFLAGS += -shared $(LIBPATHS) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib)) -DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_PREF)$(DYNNAME2)$(DYN_EXT).$(HB_VER_MAJOR).$(HB_VER_MINOR) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2)$(DYN_EXT).$(HB_VER_MAJOR).$(HB_VER_MINOR) +DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_PREF)$(DYNNAME)$(DYN_EXT).$(HB_VER_MAJOR).$(HB_VER_MINOR) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME)$(DYN_EXT).$(HB_VER_MAJOR).$(HB_VER_MINOR) include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/none.mk b/harbour/config/none.mk index d2c74d221b..6f423bbf38 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 ($(DYNNAME2),) - DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(DYNNAME2)' dynamic library skipped$(ECHOQUOTE) +ifneq ($(DYNNAME),) + DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(DYNNAME)' dynamic library skipped$(ECHOQUOTE) else DIR_RULE := endif diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk index b95700ec5d..146936bc27 100644 --- a/harbour/config/os2/gcc.mk +++ b/harbour/config/os2/gcc.mk @@ -130,7 +130,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(if $(wildcard __dyn__.def),@$(RM) __dyn__.def,) - @$(ECHO) $(ECHOQUOTE)LIBRARY $(DYNNAME2) INITINSTANCE TERMINSTANCE$(ECHOQUOTE) >> __dyn__.def + @$(ECHO) $(ECHOQUOTE)LIBRARY $(DYNNAME) INITINSTANCE TERMINSTANCE$(ECHOQUOTE) >> __dyn__.def @$(ECHO) $(ECHOQUOTE)PROTMODE$(ECHOQUOTE) >> __dyn__.def @$(ECHO) $(ECHOQUOTE)CODE PRELOAD MOVEABLE DISCARDABLE$(ECHOQUOTE) >> __dyn__.def @$(ECHO) $(ECHOQUOTE)DATA PRELOAD MOVEABLE MULTIPLE NONSHARED$(ECHOQUOTE) >> __dyn__.def diff --git a/harbour/config/vxworks/diab.mk b/harbour/config/vxworks/diab.mk index 7e0e50e8cd..6a63a09aac 100644 --- a/harbour/config/vxworks/diab.mk +++ b/harbour/config/vxworks/diab.mk @@ -97,7 +97,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dynlib_object)) - $(DY) $(DFLAGS) -soname="$(LIB_PREF)$(DYNNAME2)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP) + $(DY) $(DFLAGS) -soname="$(LIB_PREF)$(DYNNAME)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/vxworks/gcc.mk b/harbour/config/vxworks/gcc.mk index da6628e14f..0ba7f26907 100644 --- a/harbour/config/vxworks/gcc.mk +++ b/harbour/config/vxworks/gcc.mk @@ -78,7 +78,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dynlib_object)) - $(DY) $(DFLAGS) -Wl,-soname,"$(LIB_PREF)$(DYNNAME2)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP) + $(DY) $(DFLAGS) -Wl,-soname,"$(LIB_PREF)$(DYNNAME)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP) endef DY_RULE = $(create_dynlib) diff --git a/harbour/src/dynlib/2nd/Makefile b/harbour/src/dynlib/2nd/Makefile index 22979a69e5..25cd933663 100644 --- a/harbour/src/dynlib/2nd/Makefile +++ b/harbour/src/dynlib/2nd/Makefile @@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk ifneq ($(DYNDIRLIST_BASE),) DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm - DYNNAME2 := $(HB_DYNLIB_BASE_2ND) + DYNNAME := $(HB_DYNLIB_BASE_2ND) include $(TOP)$(ROOT)config/dyn.mk diff --git a/harbour/src/dynlib/Makefile b/harbour/src/dynlib/Makefile index 66ce1d4efc..b6a19bcc6e 100644 --- a/harbour/src/dynlib/Makefile +++ b/harbour/src/dynlib/Makefile @@ -9,7 +9,7 @@ include $(TOP)$(ROOT)config/global.mk ifneq ($(DYNDIRLIST_BASE),) DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt - DYNNAME2 := $(HB_DYNLIB_BASE) + DYNNAME := $(HB_DYNLIB_BASE) include $(TOP)$(ROOT)config/dyn.mk