make/Main.gmk

rev 55814 : imported patch 8212970

*** 76,96 ****
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
  
  interim-cldrconverter:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
  
  buildtools-jdk:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
  
  buildtools-modules:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
  
  buildtools-hotspot:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
      buildtools-hotspot
  
  ################################################################################
  # Special targets for certain modules
  
--- 76,100 ----
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
  
  interim-cldrconverter:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
   
+ interim-tzdb:
+         +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
+ 
+ 
  buildtools-jdk:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
  
  buildtools-modules:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
  
  buildtools-hotspot:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter interim-tzdb buildtools-jdk buildtools-modules \
      buildtools-hotspot
  
  ################################################################################
  # Special targets for certain modules
  
*** 646,656 ****
  else
    $(LANGTOOLS_GENSRC_TARGETS): buildtools-langtools
  
    interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
  
!   buildtools-jdk: interim-langtools interim-cldrconverter
  
    buildtools-hotspot: interim-langtools
  
    buildtools-modules: exploded-image-base
  
--- 650,660 ----
  else
    $(LANGTOOLS_GENSRC_TARGETS): buildtools-langtools
  
    interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
  
!   buildtools-jdk: interim-langtools interim-cldrconverter interim-tzdb
  
    buildtools-hotspot: interim-langtools
  
    buildtools-modules: exploded-image-base