equal
deleted
inserted
replaced
558 # file. |
558 # file. |
559 |
559 |
560 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ |
560 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ |
561 images make-support test-make bundles |
561 images make-support test-make bundles |
562 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) |
562 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) |
|
563 CLEAN_SUPPORT_DIRS += demos |
|
564 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS)) |
563 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib |
565 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib |
564 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) |
566 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) |
565 CLEAN_PHASES := gensrc java native include docs |
567 CLEAN_PHASES := gensrc java native include docs |
566 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES)) |
568 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES)) |
567 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES)) |
569 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES)) |
574 ($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*) |
576 ($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*) |
575 $(ECHO) Cleaned all build artifacts. |
577 $(ECHO) Cleaned all build artifacts. |
576 |
578 |
577 $(CLEAN_DIR_TARGETS): |
579 $(CLEAN_DIR_TARGETS): |
578 $(call CleanDir,$(patsubst clean-%, %, $@)) |
580 $(call CleanDir,$(patsubst clean-%, %, $@)) |
|
581 |
|
582 $(CLEAN_SUPPORT_DIR_TARGETS): |
|
583 $(call CleanSupportDir,$(patsubst clean-%, %, $@)) |
579 |
584 |
580 $(CLEAN_TEST_TARGETS): |
585 $(CLEAN_TEST_TARGETS): |
581 $(call CleanTest,$(patsubst clean-test-%, %, $@)) |
586 $(call CleanTest,$(patsubst clean-test-%, %, $@)) |
582 |
587 |
583 $(CLEAN_PHASE_TARGETS): |
588 $(CLEAN_PHASE_TARGETS): |
608 && $(RM) -r $(OUTPUT_ROOT)) \ |
613 && $(RM) -r $(OUTPUT_ROOT)) \ |
609 fi \ |
614 fi \ |
610 ) |
615 ) |
611 $(ECHO) Cleaned everything, you will have to re-run configure. |
616 $(ECHO) Cleaned everything, you will have to re-run configure. |
612 |
617 |
613 ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_TEST_TARGETS) \ |
618 ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \ |
614 $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS) |
619 $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \ |
|
620 $(CLEAN_MODULE_PHASE_TARGETS) |
615 |
621 |
616 ################################################################################ |
622 ################################################################################ |
617 # Declare *-only targets for each normal target |
623 # Declare *-only targets for each normal target |
618 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t))) |
624 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t))) |
619 |
625 |