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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/config.sub ('k') | source/config/icu-config-bottom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/config/Makefile.inc.in
diff --git a/source/config/Makefile.inc.in b/source/config/Makefile.inc.in
index c34de8b8dfad0ec16fe69447d972441f7a2e4653..9ee94dd3008d0ab9d48f4635f5c7847d566c769c 100644
--- a/source/config/Makefile.inc.in
+++ b/source/config/Makefile.inc.in
@@ -1,6 +1,6 @@
## -*-makefile-*-
#******************************************************************************
-# Copyright (C) 1999-2012, International Business Machines
+# Copyright (C) 1999-2014, International Business Machines
# Corporation and others. All Rights Reserved.
#******************************************************************************
# This Makefile.inc is designed to be included into projects which make use
@@ -115,7 +115,7 @@ ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_BASE = $(LIBS) -L$(libdir)
+ICULIBS_BASE = -L$(libdir)
# for icu-config to test with
ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
@@ -186,14 +186,13 @@ AR = @AR@
ARFLAGS := @ARFLAGS@ $(ARFLAGS)
#SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}"
CC = @CC@
-CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include
+CFLAGS = @UCONFIG_CFLAGS@
+CPPFLAGS = @UCONFIG_CPPFLAGS@ -I$(prefix)/include
+CXXFLAGS = @UCONFIG_CXXFLAGS@
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
DEFAULT_MODE = @DATA_PACKAGING_MODE@
DEFS = @DEFS@
-FFLAGS = @FFLAGS@
# use a consistent INSTALL
INSTALL = $(SHELL) $(pkgdatadir)/install-sh -c
INSTALL_DATA = @INSTALL_DATA@
@@ -201,7 +200,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
+LDFLAGS = $(RPATHLDFLAGS)
LIBS = @LIBS@
LIB_M = @LIB_M@
LIB_VERSION = @LIB_VERSION@
« 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