diff --git a/makefiles/BuildJdk.gmk b/makefiles/BuildJdk.gmk index 42cc78968630e39f0ff4c532ad6054d27fe37565..9a42d01277d69fe1d46671ddad77da3f5219dba4 100644 --- a/makefiles/BuildJdk.gmk +++ b/makefiles/BuildJdk.gmk @@ -52,7 +52,7 @@ import-only: gensrc: import gensrc-only gensrc-only: - +$(MAKE) -f GenerateJavaSources.gmk + +$(MAKE) -f GenerateSources.gmk # Ok, now gensrc is fully populated. gendata: gensrc gendata-only diff --git a/makefiles/CreateJars.gmk b/makefiles/CreateJars.gmk index 834df5cc49907da4f23178bba73810d91e0a215b..74fb5f80c846c8576a2410443bdc98b8d62320e4 100644 --- a/makefiles/CreateJars.gmk +++ b/makefiles/CreateJars.gmk @@ -715,7 +715,7 @@ endif ########################################################################################## # Get the CLDRVERSION -include GensrcCLDR.gmk +include gensrc/GensrcCLDR.gmk CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar diff --git a/makefiles/GenerateData.gmk b/makefiles/GenerateData.gmk index b0c65019266451afc474c76f5adbe4f676488149..f4739ee4342bde255bee15070c878aea25f0399b 100644 --- a/makefiles/GenerateData.gmk +++ b/makefiles/GenerateData.gmk @@ -38,16 +38,16 @@ include Tools.gmk # These are written directly into classes dir. GENDATA := -include GendataBreakIterator.gmk +include gendata/GendataBreakIterator.gmk GENDATA += $(BREAK_ITERATOR) -include GendataFontConfig.gmk +include gendata/GendataFontConfig.gmk GENDATA += $(GENDATA_FONT_CONFIG) -include GendataTZDB.gmk +include gendata/GendataTZDB.gmk GENDATA += $(GENDATA_TZDB) -include GendataHtml32dtd.gmk +include gendata/GendataHtml32dtd.gmk GENDATA += $(GENDATA_HTML32DTD) ########################################################################################## diff --git a/makefiles/GenerateJavaSources.gmk b/makefiles/GenerateSources.gmk similarity index 81% rename from makefiles/GenerateJavaSources.gmk rename to makefiles/GenerateSources.gmk index ef40ab53e435d952287d9e03d5bf827dcfd5e71e..5246cc976982f89d3dfdb68b6c5c299cfeaa8808 100644 --- a/makefiles/GenerateJavaSources.gmk +++ b/makefiles/GenerateSources.gmk @@ -38,53 +38,53 @@ include Tools.gmk # Now include all the rules that generate Java sources. # The Java sources are written into the gensrc_.... directories. -include GensrcProperties.gmk +include gensrc/GensrcProperties.gmk GENSRC += $(GENSRC_PROPERTIES) -include GensrcLocaleDataMetaInfo.gmk +include gensrc/GensrcLocaleDataMetaInfo.gmk GENSRC += $(GENSRC_LOCALEDATAMETAINFO) -include GensrcCharacterData.gmk +include gensrc/GensrcCharacterData.gmk GENSRC += $(GENSRC_CHARACTERDATA) -include GensrcJDWP.gmk +include gensrc/GensrcJDWP.gmk GENSRC += $(GENSRC_JDWP) -include GensrcMisc.gmk +include gensrc/GensrcMisc.gmk GENSRC += $(GENSRC_MISC) -include GensrcCharsetMapping.gmk +include gensrc/GensrcCharsetMapping.gmk GENSRC += $(GENSRC_CHARSETMAPPING) -include GensrcCharsetCoder.gmk +include gensrc/GensrcCharsetCoder.gmk GENSRC += $(GENSRC_CHARSETCODER) -include GensrcBuffer.gmk +include gensrc/GensrcBuffer.gmk GENSRC += $(GENSRC_BUFFER) -include GensrcExceptions.gmk +include gensrc/GensrcExceptions.gmk GENSRC += $(GENSRC_EXCEPTIONS) ifneq ($(OPENJDK_TARGET_OS), windows) -include GensrcIcons.gmk +include gensrc/GensrcIcons.gmk GENSRC += $(GENSRC_AWT_ICONS) ifeq ($(OPENJDK_TARGET_OS), macosx) GENSRC += $(GENSRC_OSX_ICONS) endif -include GensrcX11Wrappers.gmk +include gensrc/GensrcX11Wrappers.gmk GENSRC += $(GENSRC_X11WRAPPERS) endif -include GensrcCLDR.gmk +include gensrc/GensrcCLDR.gmk GENSRC += $(GENSRC_CLDR) -include GensrcSwing.gmk +include gensrc/GensrcSwing.gmk GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS) ifeq ($(OPENJDK_TARGET_OS), macosx) - include GensrcJObjC.gmk + include gensrc/GensrcJObjC.gmk GENSRC += $(GENSRC_JOBJC) endif diff --git a/makefiles/GendataBreakIterator.gmk b/makefiles/gendata/GendataBreakIterator.gmk similarity index 100% rename from makefiles/GendataBreakIterator.gmk rename to makefiles/gendata/GendataBreakIterator.gmk diff --git a/makefiles/GendataFontConfig.gmk b/makefiles/gendata/GendataFontConfig.gmk similarity index 100% rename from makefiles/GendataFontConfig.gmk rename to makefiles/gendata/GendataFontConfig.gmk diff --git a/makefiles/GendataHtml32dtd.gmk b/makefiles/gendata/GendataHtml32dtd.gmk similarity index 100% rename from makefiles/GendataHtml32dtd.gmk rename to makefiles/gendata/GendataHtml32dtd.gmk diff --git a/makefiles/GendataTZDB.gmk b/makefiles/gendata/GendataTZDB.gmk similarity index 100% rename from makefiles/GendataTZDB.gmk rename to makefiles/gendata/GendataTZDB.gmk diff --git a/makefiles/GendataTimeZone.gmk b/makefiles/gendata/GendataTimeZone.gmk similarity index 100% rename from makefiles/GendataTimeZone.gmk rename to makefiles/gendata/GendataTimeZone.gmk diff --git a/makefiles/GensrcBuffer.gmk b/makefiles/gensrc/GensrcBuffer.gmk similarity index 100% rename from makefiles/GensrcBuffer.gmk rename to makefiles/gensrc/GensrcBuffer.gmk diff --git a/makefiles/GensrcCLDR.gmk b/makefiles/gensrc/GensrcCLDR.gmk similarity index 100% rename from makefiles/GensrcCLDR.gmk rename to makefiles/gensrc/GensrcCLDR.gmk diff --git a/makefiles/GensrcCharacterData.gmk b/makefiles/gensrc/GensrcCharacterData.gmk similarity index 100% rename from makefiles/GensrcCharacterData.gmk rename to makefiles/gensrc/GensrcCharacterData.gmk diff --git a/makefiles/GensrcCharsetCoder.gmk b/makefiles/gensrc/GensrcCharsetCoder.gmk similarity index 100% rename from makefiles/GensrcCharsetCoder.gmk rename to makefiles/gensrc/GensrcCharsetCoder.gmk diff --git a/makefiles/GensrcCharsetMapping.gmk b/makefiles/gensrc/GensrcCharsetMapping.gmk similarity index 100% rename from makefiles/GensrcCharsetMapping.gmk rename to makefiles/gensrc/GensrcCharsetMapping.gmk diff --git a/makefiles/GensrcExceptions.gmk b/makefiles/gensrc/GensrcExceptions.gmk similarity index 100% rename from makefiles/GensrcExceptions.gmk rename to makefiles/gensrc/GensrcExceptions.gmk diff --git a/makefiles/GensrcIcons.gmk b/makefiles/gensrc/GensrcIcons.gmk similarity index 100% rename from makefiles/GensrcIcons.gmk rename to makefiles/gensrc/GensrcIcons.gmk diff --git a/makefiles/GensrcJDWP.gmk b/makefiles/gensrc/GensrcJDWP.gmk similarity index 100% rename from makefiles/GensrcJDWP.gmk rename to makefiles/gensrc/GensrcJDWP.gmk diff --git a/makefiles/GensrcJObjC.gmk b/makefiles/gensrc/GensrcJObjC.gmk similarity index 100% rename from makefiles/GensrcJObjC.gmk rename to makefiles/gensrc/GensrcJObjC.gmk diff --git a/makefiles/GensrcLocaleDataMetaInfo.gmk b/makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk similarity index 100% rename from makefiles/GensrcLocaleDataMetaInfo.gmk rename to makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk diff --git a/makefiles/GensrcMisc.gmk b/makefiles/gensrc/GensrcMisc.gmk similarity index 100% rename from makefiles/GensrcMisc.gmk rename to makefiles/gensrc/GensrcMisc.gmk diff --git a/makefiles/GensrcProperties.gmk b/makefiles/gensrc/GensrcProperties.gmk similarity index 100% rename from makefiles/GensrcProperties.gmk rename to makefiles/gensrc/GensrcProperties.gmk diff --git a/makefiles/GensrcSwing.gmk b/makefiles/gensrc/GensrcSwing.gmk similarity index 100% rename from makefiles/GensrcSwing.gmk rename to makefiles/gensrc/GensrcSwing.gmk diff --git a/makefiles/GensrcX11Wrappers.gmk b/makefiles/gensrc/GensrcX11Wrappers.gmk similarity index 100% rename from makefiles/GensrcX11Wrappers.gmk rename to makefiles/gensrc/GensrcX11Wrappers.gmk