# HG changeset patch
# User amurillo
# Date 1438711170 25200
# Node ID 258c54af95dd2b8e988d45d13cc17e741e0d46f5
# Parent  b5af064ce491e2286d52f8fb665c693739e079a6# Parent  761ddfee3ef2d4e57d68926ff465423c68fb8c35
Merge

diff -r b5af064ce491 -r 258c54af95dd 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