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

Side by Side Diff: source/config/Makefile.inc.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/config.sub ('k') | source/config/icu-config-bottom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## -*-makefile-*- 1 ## -*-makefile-*-
2 #****************************************************************************** 2 #******************************************************************************
3 # Copyright (C) 1999-2012, International Business Machines 3 # Copyright (C) 1999-2014, International Business Machines
4 # Corporation and others. All Rights Reserved. 4 # Corporation and others. All Rights Reserved.
5 #****************************************************************************** 5 #******************************************************************************
6 # This Makefile.inc is designed to be included into projects which make use 6 # This Makefile.inc is designed to be included into projects which make use
7 # of the ICU. 7 # of the ICU.
8 8
9 # CONTENTS OF THIS FILE 9 # CONTENTS OF THIS FILE
10 # 1). Base configuration information and linkage 10 # 1). Base configuration information and linkage
11 # 2). Variables giving access to ICU tools 11 # 2). Variables giving access to ICU tools
12 # 3). Host information 12 # 3). Host information
13 # 4). Compiler flags and settings 13 # 4). Compiler flags and settings
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 109 ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
110 ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VER SION) 110 ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VER SION)
111 ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VER SION) 111 ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VER SION)
112 ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 112 ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
113 ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 113 ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
114 ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 114 ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
115 ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 115 ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
116 ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 116 ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
117 ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) 117 ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
118 ICULIBS_BASE = $(LIBS) -L$(libdir) 118 ICULIBS_BASE = -L$(libdir)
119 119
120 # for icu-config to test with 120 # for icu-config to test with
121 ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFF IX_VERSION}.${SO} 121 ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFF IX_VERSION}.${SO}
122 ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} 122 ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
123 123
124 # ICULIBS is the set of libraries your application should link 124 # ICULIBS is the set of libraries your application should link
125 # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 125 # with usually. Many applications will want to add $(ICULIBS_I18N) as well.
126 ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 126 ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
127 127
128 # Proper echo newline handling is needed in icu-config 128 # Proper echo newline handling is needed in icu-config
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 ################################################################## 179 ##################################################################
180 # 180 #
181 # *4* compiler flags and misc. options 181 # *4* compiler flags and misc. options
182 # 182 #
183 ################################################################## 183 ##################################################################
184 AR = @AR@ 184 AR = @AR@
185 # initial tab keeps it out of the shell version. 185 # initial tab keeps it out of the shell version.
186 ARFLAGS := @ARFLAGS@ $(ARFLAGS) 186 ARFLAGS := @ARFLAGS@ $(ARFLAGS)
187 #SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}" 187 #SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}"
188 CC = @CC@ 188 CC = @CC@
189 CFLAGS = @CFLAGS@
190 CPP = @CPP@ 189 CPP = @CPP@
191 CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include 190 CFLAGS = @UCONFIG_CFLAGS@
191 CPPFLAGS = @UCONFIG_CPPFLAGS@ -I$(prefix)/include
192 CXXFLAGS = @UCONFIG_CXXFLAGS@
192 CXX = @CXX@ 193 CXX = @CXX@
193 CXXFLAGS = @CXXFLAGS@
194 DEFAULT_MODE = @DATA_PACKAGING_MODE@ 194 DEFAULT_MODE = @DATA_PACKAGING_MODE@
195 DEFS = @DEFS@ 195 DEFS = @DEFS@
196 FFLAGS = @FFLAGS@
197 # use a consistent INSTALL 196 # use a consistent INSTALL
198 INSTALL = $(SHELL) $(pkgdatadir)/install-sh -c 197 INSTALL = $(SHELL) $(pkgdatadir)/install-sh -c
199 INSTALL_DATA = @INSTALL_DATA@ 198 INSTALL_DATA = @INSTALL_DATA@
200 INSTALL_DATA = @INSTALL_DATA@ 199 INSTALL_DATA = @INSTALL_DATA@
201 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 200 INSTALL_PROGRAM = @INSTALL_PROGRAM@
202 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 201 INSTALL_PROGRAM = @INSTALL_PROGRAM@
203 INSTALL_SCRIPT = @INSTALL_SCRIPT@ 202 INSTALL_SCRIPT = @INSTALL_SCRIPT@
204 LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) 203 LDFLAGS = $(RPATHLDFLAGS)
205 LIBS = @LIBS@ 204 LIBS = @LIBS@
206 LIB_M = @LIB_M@ 205 LIB_M = @LIB_M@
207 LIB_VERSION = @LIB_VERSION@ 206 LIB_VERSION = @LIB_VERSION@
208 LIB_VERSION_MAJOR = @LIB_VERSION_MAJOR@ 207 LIB_VERSION_MAJOR = @LIB_VERSION_MAJOR@
209 MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs 208 MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs
210 RANLIB = @RANLIB@ 209 RANLIB = @RANLIB@
211 RMV = rm -rf 210 RMV = rm -rf
212 SHELL = @SHELL@ 211 SHELL = @SHELL@
213 SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared 212 SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
214 SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared 213 SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 # The selfcheck is just a sanity check that this makefile is 284 # The selfcheck is just a sanity check that this makefile is
286 # parseable. The mh fragment is only included if this does not occur. 285 # parseable. The mh fragment is only included if this does not occur.
287 286
288 ifeq (selfcheck,$(MAKECMDGOALS)) #M# 287 ifeq (selfcheck,$(MAKECMDGOALS)) #M#
289 selfcheck: #M# 288 selfcheck: #M#
290 @echo passed #M# 289 @echo passed #M#
291 else #M# 290 else #M#
292 include $(pkgdatadir)/config/@platform_make_fragment_name@ 291 include $(pkgdatadir)/config/@platform_make_fragment_name@
293 endif #M# 292 endif #M#
294 293
OLDNEW
« no previous file with comments | « source/config.sub ('k') | source/config/icu-config-bottom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698