make/Main.gmk
changeset 22716 cf32fe2eb254
parent 22714 a752920c4317
child 22721 63761da45392
equal deleted inserted replaced
22715:8621ef3d6caa 22716:cf32fe2eb254
    69 	@$(call CheckIfMakeAtEnd)
    69 	@$(call CheckIfMakeAtEnd)
    70 
    70 
    71 # Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
    71 # Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
    72 # is up to date after changes to configure
    72 # is up to date after changes to configure
    73 $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
    73 $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
    74 	@$(ECHO) ERROR: $(SPEC) is not up to date
    74 	@$(ECHO) "ERROR: $(SPEC) is not up to date."
    75 	@$(ECHO) Please rerun configure!
    75 	@$(ECHO) "Please rerun configure! Easiest way to do this is by running"
       
    76 	@$(ECHO) "'make reconfigure'."
    76 	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
    77 	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
    77 
    78 
    78 start-make: $(SPEC)
    79 start-make: $(SPEC)
    79 	@$(call AtMakeStart)
    80 	@$(call AtMakeStart)
    80 
    81 
   233 clean-docs:
   234 clean-docs:
   234 	$(call CleanComponent,docs)
   235 	$(call CleanComponent,docs)
   235 	$(call CleanComponent,docstemp)
   236 	$(call CleanComponent,docstemp)
   236 clean-test:
   237 clean-test:
   237 	$(call CleanComponent,testoutput)
   238 	$(call CleanComponent,testoutput)
       
   239 	
       
   240 reconfigure:
       
   241         ifneq ($(CONFIGURE_COMMAND_LINE), )
       
   242 	  @$(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
       
   243         else
       
   244 	  @$(ECHO) "Re-running configure using default settings"
       
   245         endif
       
   246 	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure "$(CONFIGURE_COMMAND_LINE)" )
   238 
   247 
   239 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
   248 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
   240 .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
   249 .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
   241 .PHONY: default all clean dist-clean bootcycle-images start-make
   250 .PHONY: default all clean dist-clean bootcycle-images start-make
   242 .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
   251 .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