equal
deleted
inserted
replaced
1047 ################################################################################ |
1047 ################################################################################ |
1048 # Clean targets are automatically run serially by the Makefile calling this |
1048 # Clean targets are automatically run serially by the Makefile calling this |
1049 # file. |
1049 # file. |
1050 |
1050 |
1051 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ |
1051 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ |
1052 images make-support test-make bundles buildjdk |
1052 images make-support test-make bundles buildjdk test-results test-support |
1053 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) |
1053 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) |
1054 CLEAN_SUPPORT_DIRS += demos |
1054 CLEAN_SUPPORT_DIRS += demos |
1055 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS)) |
1055 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS)) |
1056 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib |
1056 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib |
1057 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) |
1057 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) |
1091 |
1091 |
1092 # When removing the support dir, we must also remove jdk. Building classes has |
1092 # When removing the support dir, we must also remove jdk. Building classes has |
1093 # the side effect of generating native headers. The headers end up in support |
1093 # the side effect of generating native headers. The headers end up in support |
1094 # while classes and touch files end up in jdk. |
1094 # while classes and touch files end up in jdk. |
1095 clean-support: clean-jdk |
1095 clean-support: clean-jdk |
|
1096 |
|
1097 clean-test: clean-test-results clean-test-support |
1096 |
1098 |
1097 # Remove everything, including configure configuration. If the output |
1099 # Remove everything, including configure configuration. If the output |
1098 # directory was created by configure and now becomes empty, remove it as well. |
1100 # directory was created by configure and now becomes empty, remove it as well. |
1099 dist-clean: clean |
1101 dist-clean: clean |
1100 ($(CD) $(OUTPUTDIR) && \ |
1102 ($(CD) $(OUTPUTDIR) && \ |