Index: source/icudefs.mk.in |
diff --git a/source/icudefs.mk.in b/source/icudefs.mk.in |
index 7be5a4307eba59a24bd42db2622535772f3c8445..46568f30766aadc305a7a06e2989fe2d66d8d567 100644 |
--- a/source/icudefs.mk.in |
+++ b/source/icudefs.mk.in |
@@ -2,7 +2,9 @@ |
# |
# Yves Arrouye. |
# |
-# Copyright (C) 2000-2014, International Business Machines Corporation and others. |
+# Copyright (C) 2016 and later: Unicode, Inc. and others. |
+# License & terms of use: http://www.unicode.org/copyright.html |
+# Copyright (C) 2000-2016, International Business Machines Corporation and others. |
# All Rights Reserved. |
# |
@@ -165,8 +167,8 @@ COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c |
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c |
# Commands to link |
-LINK.c= $(CC) $(CFLAGS) $(LDFLAGS) |
-LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) |
+LINK.c= $(CC) $(CFLAGS) $(LDFLAGS) $(LINKFLAGS) |
+LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LINKFLAGS) |
# Commands to make a shared library |
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) |
@@ -243,7 +245,6 @@ TOOLLIBDIR=$(LIBDIR) |
DATA_STUBNAME = data |
COMMON_STUBNAME = uc |
I18N_STUBNAME = i18n |
-LAYOUT_STUBNAME = le |
LAYOUTEX_STUBNAME = lx |
IO_STUBNAME = io |
TOOLUTIL_STUBNAME = tu |
@@ -262,8 +263,6 @@ else |
USING_ICULEHB=no |
ICULEHB_TRUE=# |
ICULEHB_FALSE= |
-ICULIBS_LE = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) |
-ICULE_CFLAGS=-I$(top_srcdir) |
endif |
# Just the libs. |