1.1 --- a/common/makefiles/Main.gmk Thu Feb 21 17:39:58 2013 -0800
1.2 +++ b/common/makefiles/Main.gmk Mon Feb 25 15:08:11 2013 -0800
1.3 @@ -123,6 +123,12 @@
1.4 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
1.5 @$(call TargetExit)
1.6
1.7 +nashorn: jdk nashorn-only
1.8 +nashorn-only: start-make
1.9 + @$(call TargetEnter)
1.10 + @($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
1.11 + @$(call TargetExit)
1.12 +
1.13 demos: jdk demos-only
1.14 demos-only: start-make
1.15 @$(call TargetEnter)
1.16 @@ -131,7 +137,7 @@
1.17
1.18 # Note: This double-colon rule is intentional, to support
1.19 # custom make file integration.
1.20 -images:: source-tips demos images-only
1.21 +images:: source-tips demos nashorn images-only
1.22 images-only: start-make
1.23 @$(call TargetEnter)
1.24 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
1.25 @@ -193,7 +199,7 @@
1.26
1.27
1.28 # Remove everything, except the output from configure.
1.29 -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
1.30 +clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs
1.31 @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
1.32 @$(ECHO) Cleaned all build artifacts.
1.33
1.34 @@ -223,6 +229,8 @@
1.35 $(call CleanComponent,hotspot)
1.36 clean-jdk:
1.37 $(call CleanComponent,jdk)
1.38 +clean-nashorn:
1.39 + $(call CleanComponent,nashorn)
1.40 clean-images:
1.41 $(call CleanComponent,images)
1.42 clean-overlay-images:
1.43 @@ -233,10 +241,10 @@
1.44 $(call CleanComponent,docs)
1.45 $(call CleanComponent,docstemp)
1.46
1.47 -.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
1.48 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
1.49 +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
1.50 +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
1.51 .PHONY: all test clean dist-clean bootcycle-images start-make
1.52 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
1.53 +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
1.54 .PHONY: profiles profiles-only profiles-oscheck
1.55
1.56 FRC: # Force target
