equal
deleted
inserted
replaced
764 |
764 |
765 # For the full JDK compile commands, create all possible generated sources |
765 # For the full JDK compile commands, create all possible generated sources |
766 $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc)) |
766 $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc)) |
767 $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java)) |
767 $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java)) |
768 |
768 |
|
769 $(COMPILE_COMMANDS_TARGETS_HOTSPOT): clean-compile-commands |
|
770 $(COMPILE_COMMANDS_TARGETS_JDK): clean-compile-commands |
769 compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) |
771 compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) |
770 compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK) |
772 compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK) |
771 |
773 |
772 # Jmods cannot be created until we have the jmod tool ready to run. During |
774 # Jmods cannot be created until we have the jmod tool ready to run. During |
773 # a normal build we run it from the exploded image, but when cross compiling |
775 # a normal build we run it from the exploded image, but when cross compiling |
1030 ifeq ($(EXTERNAL_BUILDJDK), false) |
1032 ifeq ($(EXTERNAL_BUILDJDK), false) |
1031 product-images: generate-summary |
1033 product-images: generate-summary |
1032 endif |
1034 endif |
1033 endif |
1035 endif |
1034 |
1036 |
1035 ifeq ($(OPENJDK_TARGET_OS), macosx) |
1037 ifeq ($(call isTargetOs, macosx), true) |
1036 product-images: mac-jdk-bundle |
1038 product-images: mac-jdk-bundle |
1037 endif |
1039 endif |
1038 |
1040 |
1039 # This target builds the documentation image |
1041 # This target builds the documentation image |
1040 docs-image: docs-jdk |
1042 docs-image: docs-jdk |
1137 ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log* compile_commands.json) |
1139 ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log* compile_commands.json) |
1138 $(ECHO) Cleaned all build artifacts. |
1140 $(ECHO) Cleaned all build artifacts. |
1139 |
1141 |
1140 clean-docs: |
1142 clean-docs: |
1141 $(call CleanDocs) |
1143 $(call CleanDocs) |
|
1144 |
|
1145 clean-compile-commands: |
|
1146 $(call CleanMakeSupportDir,compile-commands) |
1142 |
1147 |
1143 $(CLEAN_DIR_TARGETS): |
1148 $(CLEAN_DIR_TARGETS): |
1144 $(call CleanDir,$(patsubst clean-%, %, $@)) |
1149 $(call CleanDir,$(patsubst clean-%, %, $@)) |
1145 |
1150 |
1146 $(CLEAN_SUPPORT_DIR_TARGETS): |
1151 $(CLEAN_SUPPORT_DIR_TARGETS): |
1183 && $(RM) -r $(OUTPUTDIR)) \ |
1188 && $(RM) -r $(OUTPUTDIR)) \ |
1184 fi \ |
1189 fi \ |
1185 ) |
1190 ) |
1186 $(ECHO) Cleaned everything, you will have to re-run configure. |
1191 $(ECHO) Cleaned everything, you will have to re-run configure. |
1187 |
1192 |
1188 ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \ |
1193 ALL_TARGETS += clean clean-docs clean-compile-commands dist-clean $(CLEAN_DIR_TARGETS) \ |
1189 $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \ |
1194 $(CLEAN_SUPPORT_DIR_TARGETS) $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) \ |
1190 $(CLEAN_MODULE_PHASE_TARGETS) |
1195 $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS) |
1191 |
1196 |
1192 ################################################################################ |
1197 ################################################################################ |
1193 # Declare *-only targets for each normal target |
1198 # Declare *-only targets for each normal target |
1194 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t))) |
1199 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t))) |
1195 |
1200 |