# HG changeset patch
# User amurillo
# Date 1438711170 25200
# Node ID cf76386db5c780a66ace254e52c13f8d41aa98be
# Parent  f47ccd58ac92816b1642b2c27b670c2f37d5c68d# Parent  a74d1574da34f19f6eb2a9a7d51ecac43c55f3a3
Merge

diff -r f47ccd58ac92 -r cf76386db5c7 make/Main.gmk
--- a/make/Main.gmk	Fri Jul 31 10:15:01 2015 -0700
+++ b/make/Main.gmk	Tue Aug 04 10:59:30 2015 -0700
@@ -78,11 +78,14 @@
 interim-rmic:
 	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
+interim-cldrconverter:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+
 buildtools-jdk:
 	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools)
 
 ALL_TARGETS += buildtools-langtools interim-langtools interim-corba \
-    interim-rmic buildtools-jdk
+    interim-rmic interim-cldrconverter buildtools-jdk
 
 ################################################################################
 # Special targets for certain modules
@@ -345,7 +348,7 @@
 
   interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
 
-  buildtools-jdk: interim-langtools
+  buildtools-jdk: interim-langtools interim-cldrconverter
 
   $(CORBA_GENSRC_TARGETS): interim-langtools