From f7515e28c5df59075b640a5ead1fbaf56d0de791 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 22 Feb 2011 15:25:40 +0000 Subject: [PATCH] 2011-02-22 16:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/linux/gcc.mk * Using central macros for dynlib versions. * config/dyn.mk + Added macros to help creation of .major.minor versioned dynlib links. --- harbour/ChangeLog | 7 +++++++ harbour/config/dyn.mk | 3 +++ harbour/config/linux/gcc.mk | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 722cc6f938..0eb1628a32 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-22 16:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * config/linux/gcc.mk + * Using central macros for dynlib versions. + + * config/dyn.mk + + Added macros to help creation of .major.minor versioned dynlib links. + 2011-02-22 16:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/vxworks/gcc.mk * config/vxworks/diab.mk diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk index 0737cd4f88..5fe515dc1e 100644 --- a/harbour/config/dyn.mk +++ b/harbour/config/dyn.mk @@ -85,8 +85,11 @@ ifneq ($(DY_RULE),) DYN_NAME := $(DYN_PREF)$(DYNNAME)$(HB_DYNLIB_POST)$(DYN_EXT)$(HB_DYNLIB_PEXT) DYN_FILE := $(DYN_DIR)/$(DYN_NAME) +# for *nix links DYN_NAME2 := $(DYN_PREF)$(DYNNAME)$(DYN_EXT) +DYN_NAME_CPT := $(DYN_PREF)$(DYNNAME)$(HB_DYNLIB_POSC)$(DYN_EXT)$(HB_DYNLIB_PEXC) DYN_FILE2 := $(DYN_DIR)/$(DYN_NAME2) +DYN_FILE_CPT := $(DYN_DIR)/$(DYN_NAME3) ifneq ($(IMP_DIR),) IMP_NAME := $(LIB_PREF)$(DYNNAME)$(HB_DYNLIB_POST)$(LIB_EXT)$(HB_DYNLIB_PEXT) diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index f2b2e87284..f41b7e9987 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)$(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) +DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_PREF)$(DYNNAME)$(DYN_EXT)$(HB_DYNLIB_PEXC) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME)$(DYN_EXT)$(HB_DYNLIB_PEXC) include $(TOP)$(ROOT)config/rules.mk