mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-4419 Fixes for icu-config. These changes are common to several platforms (besides just MinGW).
X-SVN-Rev: 17686
This commit is contained in:
parent
054b67ba4b
commit
5079e77d15
3 changed files with 12 additions and 6 deletions
|
@ -81,6 +81,9 @@ I18N_STUBNAME = in
|
|||
FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
|
||||
MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
|
||||
|
||||
# The following is for Makefile.inc's use.
|
||||
ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
|
||||
|
||||
## Versioned libraries rules
|
||||
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
|
||||
# $(RM) $@ && cp ${<F} $@
|
||||
|
|
|
@ -184,9 +184,12 @@ ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
|
|||
|
||||
## Versioned import library names. The library names are versioned,
|
||||
## but the import libraries do not need versioning.
|
||||
IMPORT_LIB = $(basename $(SO_TARGET))$(IMPORT_LIB_EXT)
|
||||
MIDDLE_IMPORT_LIB = $(IMPORT_LIB)
|
||||
FINAL_IMPORT_LIB = $(MIDDLE_IMPORT_LIB)
|
||||
IMPORT_LIB = $(basename $(SO_TARGET))$(IMPORT_LIB_EXT)#M#
|
||||
MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
|
||||
FINAL_IMPORT_LIB = $(MIDDLE_IMPORT_LIB)#M#
|
||||
|
||||
# The following is for Makefile.inc's use.
|
||||
ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
|
||||
|
||||
## Versioned libraries rules
|
||||
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
|
||||
|
|
|
@ -99,9 +99,9 @@ FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
|
|||
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
|
||||
|
||||
## Versioned import library names.
|
||||
IMPORT_LIB = $(basename $(notdir $(SO_TARGET)))$(IMPORT_LIB_EXT)
|
||||
MIDDLE_IMPORT_LIB = $(basename $(notdir $(MIDDLE_SO_TARGET)))$(IMPORT_LIB_EXT)
|
||||
FINAL_IMPORT_LIB = $(basename $(notdir $(FINAL_SO_TARGET)))$(IMPORT_LIB_EXT)
|
||||
IMPORT_LIB = $(basename $(notdir $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
|
||||
MIDDLE_IMPORT_LIB = $(basename $(notdir $(MIDDLE_SO_TARGET)))$(IMPORT_LIB_EXT)#M#
|
||||
FINAL_IMPORT_LIB = $(basename $(notdir $(FINAL_SO_TARGET)))$(IMPORT_LIB_EXT)#M#
|
||||
|
||||
## Non-shared intermediate object suffix
|
||||
STATIC_O = o
|
||||
|
|
Loading…
Add table
Reference in a new issue