mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-4738 Don't put .so files in the lib directory.
X-SVN-Rev: 18557
This commit is contained in:
parent
c459740c62
commit
9b45236c3f
10 changed files with 8 additions and 12 deletions
|
@ -32,7 +32,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
|
||||
ifeq ($(ENABLE_SO_VERSION_DATA),1)
|
||||
|
|
|
@ -43,10 +43,6 @@ LD_RPATH_PRE=
|
|||
## Environment variable to set a runtime search path
|
||||
LDLIBRARYPATH_ENVVAR = LIBPATH
|
||||
|
||||
## Override Versioned target for a shared library.
|
||||
FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
|
||||
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
|
||||
|
||||
# The following is for Makefile.inc's use.
|
||||
ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
|
||||
|
||||
|
@ -67,9 +63,16 @@ SO= a
|
|||
## Non-shared intermediate object suffix
|
||||
STATIC_O = o
|
||||
|
||||
## Override Versioned target for a shared library.
|
||||
FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
|
||||
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
|
||||
SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ)))
|
||||
|
||||
## Build archive from shared object
|
||||
%.a : %.so
|
||||
$(AR) $(ARFLAGS) $@ $<
|
||||
$(LIBDIR)/%.a : %.so
|
||||
$(AR) $(ARFLAGS) $@ $<
|
||||
|
||||
## Build import list from export list
|
||||
%.e : %.exp
|
||||
|
|
|
@ -33,7 +33,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
|
||||
ifeq ($(ENABLE_SO_VERSION_DATA),1)
|
||||
|
|
|
@ -155,6 +155,7 @@ LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
|
|||
# Versioned target for a shared library.
|
||||
FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
|
||||
MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET)
|
||||
|
||||
## How ICU libraries are named... ex. $(LIBICU)uc$(SO)
|
||||
# Prefix for the ICU library names
|
||||
|
|
|
@ -32,7 +32,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
|
||||
ifeq ($(ENABLE_SO_VERSION_DATA),1)
|
||||
|
|
|
@ -26,7 +26,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
|
||||
ifeq ($(ENABLE_SO_VERSION_DATA),1)
|
||||
|
|
|
@ -26,7 +26,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
|
||||
ifeq ($(ENABLE_SO_VERSION_DATA),1)
|
||||
|
|
|
@ -33,7 +33,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
|
||||
endif
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ DEFS += -DT_CTEST_IMPLEMENTATION
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
endif
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
|
||||
SHARED_OBJECT = $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
|
||||
endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue