ICU-3576 Improve building and using static libraries
X-SVN-Rev: 15077
This commit is contained in:
parent
22acb3c825
commit
29f1907672
@ -17,8 +17,8 @@ include $(top_builddir)/icudefs.mk
|
||||
subdir = data
|
||||
|
||||
#lib icu data for link
|
||||
LIB_ICUDATA_NAME=lib$(ICUDATA_NAME)
|
||||
LIB_STATIC_ICUDATA_NAME=lib$(STATIC_PREFIX)$(ICUDATA_NAME)
|
||||
LIB_ICUDATA_NAME=$(LIBPREFIX)$(ICUDATA_NAME)
|
||||
LIB_STATIC_ICUDATA_NAME=$(LIBPREFIX)$(STATIC_PREFIX)$(ICUDATA_NAME)
|
||||
|
||||
# Allow Windows to override these options
|
||||
ifeq ($(PKGDATA_OPTS),)
|
||||
|
@ -20,7 +20,7 @@ CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB)
|
||||
## Target information
|
||||
|
||||
ifneq ($(ENABLE_STATIC),)
|
||||
TARGET = $(LIBSICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).a
|
||||
TARGET = $(LIBSICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).$(A)
|
||||
endif
|
||||
|
||||
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)
|
||||
|
Loading…
Reference in New Issue
Block a user