Index: source/test/intltest/Makefile.in |
diff --git a/source/test/intltest/Makefile.in b/source/test/intltest/Makefile.in |
index b523efee2443634c2a9826c90bbdc58fbc00df3c..0e2c3fc21c5e625a5ba6c4dbdee1cf68ecbbadf8 100644 |
--- a/source/test/intltest/Makefile.in |
+++ b/source/test/intltest/Makefile.in |
@@ -1,6 +1,6 @@ |
#****************************************************************************** |
# |
-# Copyright (C) 1999-2013, International Business Machines |
+# Copyright (C) 1999-2014, International Business Machines |
# Corporation and others. All Rights Reserved. |
# |
#****************************************************************************** |
@@ -33,12 +33,13 @@ BUILDDIR := $(BUILDDIR:test\\intltest/../../=) |
BUILDDIR := $(BUILDDIR:TEST\\INTLTEST/../../=) |
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw |
+CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT= |
DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' |
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD) |
OBJECTS = aliastst.o allcoll.o apicoll.o astrotst.o callimts.o calregts.o caltest.o \ |
-caltztst.o canittst.o citrtest.o cntabcol.o colldata.o convtest.o currcoll.o \ |
-fldset.o dadrfmt.o dadrcal.o dadrcoll.o dcfmapts.o decoll.o dtfmapts.o dtfmrgts.o dtfmtrtts.o dtfmttst.o \ |
+caltztst.o canittst.o citrtest.o colldata.o convtest.o currcoll.o collationtest.o \ |
+fldset.o dadrfmt.o dadrcal.o dcfmapts.o decoll.o dtfmapts.o dtfmrgts.o dtfmtrtts.o dtfmttst.o \ |
dtptngts.o encoll.o escoll.o ficoll.o frcoll.o g7coll.o intltest.o \ |
itercoll.o itformat.o itmajor.o itutil.o jacoll.o lcukocol.o \ |
loctest.o miscdtfm.o mnkytst.o msfmrgts.o nmfmapts.o nmfmtrt.o \ |
@@ -55,7 +56,8 @@ itrbnf.o itrbnfrt.o itrbnfp.o ucaconf.o icusvtst.o \ |
uobjtest.o idnaref.o idnaconf.o nptrans.o punyref.o testidn.o testidna.o uts46test.o \ |
incaltst.o calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o \ |
windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o dtifmtts.o \ |
-tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o |
+tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o \ |
+reldatefmttest.o simplepatternformattertest.o measfmttest.o scientificformathelpertest.o numfmtspectest.o unifiedcachetest.o quantityformattertest.o |
DEPS = $(OBJECTS:.o=.d) |