make/gensrc/Gensrc-jdk.charsets.gmk

*** 38,57 ****
      $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
      $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
  CHARSET_EXTENDED_JAVA_TEMPLATES := \
      $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
  CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
- CHARSET_EXTENDED := extcs
  CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
  
  $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
!     $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_DATA) $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
          $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
                  extcs charsets  $(CHARSET_STANDARD_OS) \
                  $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
!                 $(CHARSET_EXTENDED_JAVA_DIR)
          $(TOUCH) '$@'
  
  $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
--- 38,58 ----
      $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
      $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
  CHARSET_EXTENDED_JAVA_TEMPLATES := \
      $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
  CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
  CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
  
  $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
!     $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS) \
!     $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
!     $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
          $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
              extcs charsets  $(CHARSET_STANDARD_OS) \
              $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
!             $(CHARSET_EXTENDED_JAVA_DIR) $(LOG_INFO)
          $(TOUCH) '$@'
  
  $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)