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

Unified Diff: source/tools/icuinfo/Makefile.in

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 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/tools/gentest/gentest.vcxproj.filters ('k') | source/tools/icuinfo/icuinfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/tools/icuinfo/Makefile.in
diff --git a/source/tools/icuinfo/Makefile.in b/source/tools/icuinfo/Makefile.in
index 89c0b74be6e6a1f36fc6ab2dc14fc72c9c3da8fc..d6905406a28b2b0697ddd77a0483913c3664b4d7 100644
--- a/source/tools/icuinfo/Makefile.in
+++ b/source/tools/icuinfo/Makefile.in
@@ -1,5 +1,5 @@
## Makefile.in for ICU - tools/icuinfo
-## Copyright (c) 1999-2012, International Business Machines Corporation and
+## Copyright (c) 1999-2015, International Business Machines Corporation and
## others. All Rights Reserved.
## Madhu Katragadda
@@ -25,7 +25,7 @@ CPPFLAGS+= -I$(top_srcdir)/i18n
LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = icuinfo.o
-PLUGIN_OBJECTS = testplug.o
+@PLUGINS_TRUE@PLUGIN_OBJECTS = testplug.o
DEPS = $(OBJECTS:.o=.d)
@@ -82,10 +82,14 @@ PLUGINDIR=$(shell pwd)
PLUGINFILE=$(PLUGINDIR)/icuplugins$(SO_TARGET_VERSION_MAJOR).txt
+CFLAGS+=$(SHAREDLIBCFLAGS)
+
+@PLUGINS_TRUE@HAVE_PLUGINS=yes
+
+ifeq ($(HAVE_PLUGINS),yes)
$(PLUGINFILE): Makefile
echo "$(CURR_FULL_DIR)/$(PLUGIN) myPlugin x=4" > $@
-CFLAGS+=$(SHAREDLIBCFLAGS)
$(PLUGIN): $(PLUGIN_OBJECTS)
$(SHLIB.cc) $(SHAREDLIBCFLAGS) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS)
@@ -94,7 +98,10 @@ plugin: $(PLUGIN)
plugin-check: $(PLUGIN) $(PLUGINFILE)
$(INVOKE) ICU_PLUGINS="$(CURR_FULL_DIR)" ./$(TARGET) -v -L
-
+else
+plugin plugin-check $(PLUGIN):
+ @echo "Plugins are disabled (use --enable-plugins to enable)"
+endif
ifeq (,$(MAKECMDGOALS))
-include $(DEPS)
« no previous file with comments | « source/tools/gentest/gentest.vcxproj.filters ('k') | source/tools/icuinfo/icuinfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698