fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-02-22 16:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2011-02-22 15:01:39 +00:00
parent 788ed22d93
commit 7b2883a9e3
12 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

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

2
harbour/config/darwin/clang.mk
View File

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

2
harbour/config/darwin/gcc.mk
View File

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

4
harbour/config/darwin/icc.mk
View File

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

8
harbour/config/dyn.mk
View File

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

2
harbour/config/linux/gcc.mk
View File

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

4
harbour/config/none.mk
View File

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

2
harbour/config/os2/gcc.mk
View File

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

2
harbour/config/vxworks/diab.mk
View File

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

2
harbour/config/vxworks/gcc.mk
View File

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

2
harbour/src/dynlib/2nd/Makefile
View File

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

2
harbour/src/dynlib/Makefile
View File

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