Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: source/icudefs.mk.in

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/i18n/zonemeta.cpp ('k') | source/io/io.vcxproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Make definitions that are shared by the different subprojects of ICU. 1 # Make definitions that are shared by the different subprojects of ICU.
2 # 2 #
3 # Yves Arrouye. 3 # Yves Arrouye.
4 # 4 #
5 # Copyright (C) 2000-2013, International Business Machines Corporation and other s. 5 # Copyright (C) 2000-2014, International Business Machines Corporation and other s.
6 # All Rights Reserved. 6 # All Rights Reserved.
7 7
8 # 8 #
9 # Some of these variables are overridden in the config/mh-* files. 9 # Some of these variables are overridden in the config/mh-* files.
10 # 10 #
11 # Please be sure to update config/Makefile.inc.in if you add something here. 11 # Please be sure to update config/Makefile.inc.in if you add something here.
12 # 12 #
13 13
14 # Shell to use 14 # Shell to use
15 15
16 SHELL = @SHELL@ 16 SHELL = @SHELL@
17 17
18 # Standard directories 18 # Standard directories
19 19
20 prefix = @prefix@ 20 prefix = @prefix@
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 # be made in the mh- file for the specific platform. 242 # be made in the mh- file for the specific platform.
243 DATA_STUBNAME = data 243 DATA_STUBNAME = data
244 COMMON_STUBNAME = uc 244 COMMON_STUBNAME = uc
245 I18N_STUBNAME = i18n 245 I18N_STUBNAME = i18n
246 LAYOUT_STUBNAME = le 246 LAYOUT_STUBNAME = le
247 LAYOUTEX_STUBNAME = lx 247 LAYOUTEX_STUBNAME = lx
248 IO_STUBNAME = io 248 IO_STUBNAME = io
249 TOOLUTIL_STUBNAME = tu 249 TOOLUTIL_STUBNAME = tu
250 CTESTFW_STUBNAME = test 250 CTESTFW_STUBNAME = test
251 251
252 # get these from pkg-config, if available
253 ICULEHB_CFLAGS=@ICULEHB_CFLAGS@
254 ICULEHB_LIBS=@ICULEHB_LIBS@
255 ifneq ($(ICULEHB_CFLAGS),)
256 USING_ICULEHB=yes
257 ICULEHB_TRUE=
258 ICULEHB_FALSE=#
259 ICULIBS_LE=$(ICULEHB_LIBS)
260 ICULE_CFLAGS=$(ICULEHB_CFLAGS) -DUSING_ICULEHB
261 else
262 USING_ICULEHB=no
263 ICULEHB_TRUE=#
264 ICULEHB_FALSE=
265 ICULIBS_LE = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(IC ULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
266 ICULE_CFLAGS=-I$(top_srcdir)
267 endif
268
252 # Just the libs. 269 # Just the libs.
253 ICULIBS_DT = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(DATA_STUBNAME)$(ICUL IBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 270 ICULIBS_DT = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(DATA_STUBNAME)$(ICUL IBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
254 ICULIBS_UC = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(COMMON_STUBNAME)$(IC ULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 271 ICULIBS_UC = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(COMMON_STUBNAME)$(IC ULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
255 ICULIBS_I18N = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(I18N_STUBNAME)$(ICUL IBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 272 ICULIBS_I18N = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(I18N_STUBNAME)$(ICUL IBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
256 ICULIBS_LE = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(IC ULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
257 ICULIBS_LX = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$( ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 273 ICULIBS_LX = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$( ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
258 ICULIBS_IO = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIB SUFFIX)$(SO_TARGET_VERSION_SUFFIX) 274 ICULIBS_IO = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIB SUFFIX)$(SO_TARGET_VERSION_SUFFIX)
259 ICULIBS_CTESTFW = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(I CULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 275 ICULIBS_CTESTFW = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(I CULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
260 ICULIBS_TOOLUTIL = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(TOOLUTIL_STUBNAME)$ (ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX) 276 ICULIBS_TOOLUTIL = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(TOOLUTIL_STUBNAME)$ (ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
261 # Link commands to link to ICU libs 277 # Link commands to link to ICU libs
262 LLIBDIR = -L$(LIBDIR) 278 LLIBDIR = -L$(LIBDIR)
263 LSTUBDIR = -L$(top_builddir)/stubdata 279 LSTUBDIR = -L$(top_builddir)/stubdata
264 LCTESTFW = -L$(top_builddir)/tools/ctestfw 280 LCTESTFW = -L$(top_builddir)/tools/ctestfw
265 281
266 LIBICUDT = $(LLIBDIR) $(LSTUBDIR) $(ICULIBS_DT) 282 LIBICUDT = $(LLIBDIR) $(LSTUBDIR) $(ICULIBS_DT)
267 LIBICUUC = $(LLIBDIR) $(ICULIBS_UC) $(LSTUBDIR) $(ICULIBS_DT) 283 LIBICUUC = $(LLIBDIR) $(ICULIBS_UC) $(LSTUBDIR) $(ICULIBS_DT)
268 LIBICUI18N = $(LLIBDIR) $(ICULIBS_I18N) 284 LIBICUI18N = $(LLIBDIR) $(ICULIBS_I18N)
269 LIBICULE» = $(LLIBDIR) $(ICULIBS_LE) 285 LIBICULE» = $(ICULEHB_CFLAGS) $(LLIBDIR) $(ICULIBS_LE)
270 LIBICULX = $(LLIBDIR) $(ICULIBS_LX) 286 LIBICULX = $(LLIBDIR) $(ICULIBS_LX)
271 LIBCTESTFW = $(LCTESTFW) $(ICULIBS_CTESTFW) 287 LIBCTESTFW = $(LCTESTFW) $(ICULIBS_CTESTFW)
272 LIBICUTOOLUTIL = $(LLIBDIR) $(ICULIBS_TOOLUTIL) 288 LIBICUTOOLUTIL = $(LLIBDIR) $(ICULIBS_TOOLUTIL)
273 LIBICUIO = $(LLIBDIR) $(ICULIBS_IO) 289 LIBICUIO = $(LLIBDIR) $(ICULIBS_IO)
274 290
275 # Invoke, set library path for all ICU libraries. 291 # Invoke, set library path for all ICU libraries.
276 # overridden by icucross.mk 292 # overridden by icucross.mk
277 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir) /stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER ) 293 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir) /stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER )
278 # prefer stubdata 294 # prefer stubdata
279 PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir )/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK _CHECKER) 295 PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir )/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK _CHECKER)
(...skipping 26 matching lines...) Expand all
306 cross_buildroot = $(top_builddir) 322 cross_buildroot = $(top_builddir)
307 endif 323 endif
308 324
309 # for tests 325 # for tests
310 ifneq ($(TEST_STATUS_FILE),) 326 ifneq ($(TEST_STATUS_FILE),)
311 TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)" 327 TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)"
312 endif 328 endif
313 329
314 # optional include at top 330 # optional include at top
315 -include $(top_builddir)/icudefs.local 331 -include $(top_builddir)/icudefs.local
OLDNEW
« no previous file with comments | « source/i18n/zonemeta.cpp ('k') | source/io/io.vcxproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698