equal
deleted
inserted
replaced
459 |
459 |
460 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \ |
460 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \ |
461 $(GENDATA_MODULES) $(LIB_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES)) |
461 $(GENDATA_MODULES) $(LIB_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES)) |
462 |
462 |
463 exploded-image: $(ALL_MODULE_TARGETS) modules-xml |
463 exploded-image: $(ALL_MODULE_TARGETS) modules-xml |
|
464 # The old 'jdk' target most closely matches the new exploded-image. Keep an |
|
465 # alias for ease of use. |
|
466 jdk: exploded-image |
464 |
467 |
465 jars: main-jars nashorn-jar security-jars policy-jars |
468 jars: main-jars nashorn-jar security-jars policy-jars |
466 |
469 |
467 # Make each profile name a target that depends on it's images target. |
470 # Make each profile name a target that depends on it's images target. |
468 $(foreach p, $(ALL_PROFILES), $(eval $(p): $(p)-images $(p)-jars)) |
471 $(foreach p, $(ALL_PROFILES), $(eval $(p): $(p)-images $(p)-jars)) |
470 profiles: $(ALL_PROFILES) |
473 profiles: $(ALL_PROFILES) |
471 |
474 |
472 docs: docs-javadoc docs-jvmtidoc |
475 docs: docs-javadoc docs-jvmtidoc |
473 |
476 |
474 ALL_TARGETS += gensrc gendata copy java rmic libs launchers \ |
477 ALL_TARGETS += gensrc gendata copy java rmic libs launchers \ |
475 $(ALL_MODULE_TARGETS) exploded-image jars \ |
478 $(ALL_MODULE_TARGETS) exploded-image jdk jars \ |
476 $(ALL_PROFILES) profiles docs |
479 $(ALL_PROFILES) profiles docs |
477 |
480 |
478 ################################################################################ |
481 ################################################################################ |
479 |
482 |
480 all: images docs verify-modules |
483 all: images docs verify-modules |
490 ################################################################################ |
493 ################################################################################ |
491 |
494 |
492 # If running a clean target, disable parallel execution |
495 # If running a clean target, disable parallel execution |
493 ifneq ($(findstring clean, $(MAKECMDGOALS)), ) |
496 ifneq ($(findstring clean, $(MAKECMDGOALS)), ) |
494 .NOTPARALLEL: |
497 .NOTPARALLEL: |
|
498 # It's not recommended to run additional targets to clean on the same make |
|
499 # command line. Try to detect this and issue a warning. |
|
500 ifneq ($(filter-out clean%, $(MAKECMDGOALS)), ) |
|
501 $(warning Mixing clean targets with normal build targets will not work well \ |
|
502 and is not recommended.) |
|
503 endif |
495 endif |
504 endif |
496 |
505 |
497 CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \ |
506 CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \ |
498 bootcycle-build docs docstemp test |
507 bootcycle-build docs docstemp test |
499 CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS)) |
508 CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS)) |