equal
deleted
inserted
replaced
40 |
40 |
41 include $(SRC_ROOT)/make/MainSupport.gmk |
41 include $(SRC_ROOT)/make/MainSupport.gmk |
42 |
42 |
43 # Load the vital tools for all the makefiles. |
43 # Load the vital tools for all the makefiles. |
44 include $(SRC_ROOT)/make/common/MakeBase.gmk |
44 include $(SRC_ROOT)/make/common/MakeBase.gmk |
|
45 # Explicitly generate module deps makefile data |
|
46 include $(SRC_ROOT)/make/GenerateModuleDeps.gmk |
45 include $(SRC_ROOT)/make/common/Modules.gmk |
47 include $(SRC_ROOT)/make/common/Modules.gmk |
46 |
48 |
47 # Declare ALL_TARGETS as an immediate variable. This variable is a list of all |
49 # Declare ALL_TARGETS as an immediate variable. This variable is a list of all |
48 # valid top level targets. It's used to declare them all as PHONY and to |
50 # valid top level targets. It's used to declare them all as PHONY and to |
49 # generate the -only targets. |
51 # generate the -only targets. |
76 |
78 |
77 interim-cldrconverter: |
79 interim-cldrconverter: |
78 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk) |
80 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk) |
79 |
81 |
80 buildtools-jdk: |
82 buildtools-jdk: |
81 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools) |
83 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk) |
82 |
84 |
83 ALL_TARGETS += buildtools-langtools interim-langtools \ |
85 ALL_TARGETS += buildtools-langtools interim-langtools \ |
84 interim-rmic interim-cldrconverter buildtools-jdk |
86 interim-rmic interim-cldrconverter buildtools-jdk |
85 |
87 |
86 ################################################################################ |
88 ################################################################################ |
216 |
218 |
217 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be |
219 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be |
218 # used to track the exact sources used to build that image. |
220 # used to track the exact sources used to build that image. |
219 source-tips: $(SUPPORT_OUTPUTDIR)/source_tips |
221 source-tips: $(SUPPORT_OUTPUTDIR)/source_tips |
220 $(SUPPORT_OUTPUTDIR)/source_tips: FRC |
222 $(SUPPORT_OUTPUTDIR)/source_tips: FRC |
221 @$(MKDIR) -p $(@D) |
223 $(call MakeDir, $(@D)) |
222 @$(RM) $@ |
224 @$(RM) $@ |
223 @$(call GetSourceTips) |
225 @$(call GetSourceTips) |
224 |
226 |
225 BOOTCYCLE_TARGET := product-images |
227 BOOTCYCLE_TARGET := product-images |
226 bootcycle-images: |
228 bootcycle-images: |
658 |
660 |
659 print-modules: |
661 print-modules: |
660 @$(ECHO) $(sort $(ALL_MODULES)) |
662 @$(ECHO) $(sort $(ALL_MODULES)) |
661 |
663 |
662 create-main-targets-include: |
664 create-main-targets-include: |
663 @$(ECHO) $(LOG_INFO) Generating main target list |
665 $(call LogInfo, Generating main target list) |
664 @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \ |
666 @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \ |
665 $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk |
667 $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk |
666 |
668 |
667 ################################################################################ |
669 ################################################################################ |
668 |
670 |