equal
deleted
inserted
replaced
296 |
296 |
297 ################################################################################ |
297 ################################################################################ |
298 # Verification targets |
298 # Verification targets |
299 |
299 |
300 verify-modules: |
300 verify-modules: |
|
301 @$(call TargetEnter) |
301 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CheckModules.gmk) |
302 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CheckModules.gmk) |
|
303 @$(call TargetExit) |
302 |
304 |
303 ALL_TARGETS += verify-modules |
305 ALL_TARGETS += verify-modules |
304 |
306 |
305 ################################################################################ |
307 ################################################################################ |
306 # Install targets |
308 # Install targets |
402 # this dependency. |
404 # this dependency. |
403 ifeq ($(OPENJDK_TARGET_OS), windows) |
405 ifeq ($(OPENJDK_TARGET_OS), windows) |
404 main-jars: java.security.jgss-libs |
406 main-jars: java.security.jgss-libs |
405 endif |
407 endif |
406 |
408 |
407 images: jars demos samples exploded-image source-tips |
409 images: jars demos samples exploded-image verify-modules source-tips |
408 |
410 |
409 bootcycle-images: images |
411 bootcycle-images: images |
410 |
412 |
411 # Need to depend on jars as otherwise there will a race between all the |
413 # Need to depend on jars as otherwise there will a race between all the |
412 # invocations of CreateJars.gmk. |
414 # invocations of CreateJars.gmk. |
478 $(ALL_MODULE_TARGETS) exploded-image jdk jars \ |
480 $(ALL_MODULE_TARGETS) exploded-image jdk jars \ |
479 $(ALL_PROFILES) profiles docs |
481 $(ALL_PROFILES) profiles docs |
480 |
482 |
481 ################################################################################ |
483 ################################################################################ |
482 |
484 |
483 all: images docs verify-modules |
485 all: images docs |
484 default: exploded-image |
486 default: exploded-image |
485 |
487 |
486 ALL_TARGETS += default all |
488 ALL_TARGETS += default all |
487 |
489 |
488 ################################################################################ |
490 ################################################################################ |
493 ################################################################################ |
495 ################################################################################ |
494 # Clean targets are automatically run serially by the Makefile calling this |
496 # Clean targets are automatically run serially by the Makefile calling this |
495 # file. |
497 # file. |
496 |
498 |
497 CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \ |
499 CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \ |
498 bootcycle-build docs docstemp test |
500 bootcycle-build docs docstemp test make-support |
499 CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS)) |
501 CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS)) |
500 |
502 |
501 # Remove everything, except the output from configure. |
503 # Remove everything, except the output from configure. |
502 clean: $(CLEAN_TARGETS) |
504 clean: $(CLEAN_TARGETS) |
503 ($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*) |
505 ($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*) |