ICU-59117.0.1.tar.gz

[apple/icu.git] / icuSources / tools / toolutil / Makefile.in

diff --git a/icuSources/tools/toolutil/Makefile.in b/icuSources/tools/toolutil/Makefile.in
index ac171084b27a530c3195a7e9259a9d3a8f962ddb..82ca0d8a395dd184ddb1a7e9ce08456e1e36d77b 100644 (file)
--- a/icuSources/tools/toolutil/Makefile.in
+++ b/icuSources/tools/toolutil/Makefile.in
@@ -1,6 +1,8 @@
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html

 #******************************************************************************
 #
 #******************************************************************************
 #

-#   Copyright (C) 1999-2010, International Business Machines
+#   Copyright (C) 1999-2014, International Business Machines

 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************


@@ -43,18 +45,21 @@ DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
 CFLAGS += $(LIBCFLAGS)
 CXXFLAGS += $(LIBCXXFLAGS)
 
 CFLAGS += $(LIBCFLAGS)
 CXXFLAGS += $(LIBCXXFLAGS)
 

-ifneq ($(top_builddir),$(top_srcdir))
-CPPFLAGS += -I$(top_builddir)/common
-endif
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
+CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
+
+# from icuinfo
+CPPFLAGS+=  "-DU_BUILD=\"@build@\"" "-DU_HOST=\"@host@\"" "-DU_CC=\"@CC@\"" "-DU_CXX=\"@CXX@\""
+CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+

 DEFS += -DU_TOOLUTIL_IMPLEMENTATION
 LDFLAGS += $(LDFLAGSICUTOOLUTIL)
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS)
 
 OBJECTS = filestrm.o package.o pkgitems.o swapimpl.o toolutil.o unewdata.o \
 DEFS += -DU_TOOLUTIL_IMPLEMENTATION
 LDFLAGS += $(LDFLAGSICUTOOLUTIL)
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS)
 
 OBJECTS = filestrm.o package.o pkgitems.o swapimpl.o toolutil.o unewdata.o \

+collationinfo.o denseranges.o \

 ucm.o ucmstate.o uoptions.o uparse.o \
 ucbuf.o xmlparser.o writesrc.o \
 ucm.o ucmstate.o uoptions.o uparse.o \
 ucbuf.o xmlparser.o writesrc.o \

-pkg_icu.o pkg_genc.o pkg_gencmn.o flagparser.o filetools.o \
+pkg_icu.o pkg_genc.o pkg_gencmn.o ppucd.o flagparser.o filetools.o \

 udbgutil.o dbgutil.o ucln_tu.o
 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
 udbgutil.o dbgutil.o ucln_tu.o
 
 STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))


@@ -131,6 +136,11 @@ endif
 ifneq ($(ENABLE_SHARED),)
 $(SHARED_OBJECT): $(OBJECTS)
        $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS)
 ifneq ($(ENABLE_SHARED),)
 $(SHARED_OBJECT): $(OBJECTS)
        $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS)

+ifeq ($(ENABLE_RPATH),YES)
+ifneq ($(wildcard $(libdir)/$(MIDDLE_SO_TARGET)),)
+       $(warning RPATH warning: --enable-rpath means test programs may use existing $(libdir)/$(MIDDLE_SO_TARGET))
+endif
+endif

 endif
 
 ifeq (,$(MAKECMDGOALS))
 endif
 
 ifeq (,$(MAKECMDGOALS))