Merge

Thu, 09 May 2013 14:23:32 -0700

author
lana
date
Thu, 09 May 2013 14:23:32 -0700
changeset 711
49ea9293fa49
parent 707
892a0196d10c
parent 710
e2eb6bc06621
child 712
40bba0507f76
child 894
1fca390200c1

Merge

     1.1 --- a/common/makefiles/Main.gmk	Mon May 06 11:41:35 2013 -0700
     1.2 +++ b/common/makefiles/Main.gmk	Thu May 09 14:23:32 2013 -0700
     1.3 @@ -240,10 +240,10 @@
     1.4  clean-test:
     1.5  	$(call CleanComponent,testoutput)
     1.6  
     1.7 -.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
     1.8 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
     1.9 -.PHONY: all test clean dist-clean bootcycle-images start-make
    1.10 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
    1.11 +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
    1.12 +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
    1.13 +.PHONY: all clean dist-clean bootcycle-images start-make
    1.14 +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
    1.15  .PHONY: profiles profiles-only profiles-oscheck
    1.16  
    1.17  FRC: # Force target

mercurial