make/Init.gmk
changeset 47313 eb28be8f935d
parent 47253 92fd0e04e0e1
child 47346 ea082b202a23
equal deleted inserted replaced
47312:d4f959806fe9 47313:eb28be8f935d
   135     SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
   135     SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
   136     PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
   136     PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
   137 
   137 
   138     # The spec files depend on the autoconf source code. This check makes sure
   138     # The spec files depend on the autoconf source code. This check makes sure
   139     # the configuration is up to date after changes to configure.
   139     # the configuration is up to date after changes to configure.
   140     CUSTOM_CONFIG_DIR ?= $(topdir)/closed/autoconf
   140     $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
   141 
   141             $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*))
   142     $(SPECS): $(wildcard $(topdir)/common/autoconf/*) $(wildcard $(CUSTOM_CONFIG_DIR)/*)
       
   143         ifeq ($(CONF_CHECK), fail)
   142         ifeq ($(CONF_CHECK), fail)
   144 	  @echo "Error: The configuration is not up to date for '$(lastword $(subst /, , $(dir $@)))'."
   143 	  @echo Error: The configuration is not up to date for \
       
   144 	      "'$(lastword $(subst /, , $(dir $@)))'."
   145 	  $(call PrintConfCheckFailed)
   145 	  $(call PrintConfCheckFailed)
   146 	  @exit 2
   146 	  @exit 2
   147         else ifeq ($(CONF_CHECK), auto)
   147         else ifeq ($(CONF_CHECK), auto)
   148 	  @echo "Note: The configuration is not up to date for '$(lastword $(subst /, , $(dir $@)))'."
   148 	  @echo Note: The configuration is not up to date for \
       
   149 	      "'$(lastword $(subst /, , $(dir $@)))'."
   149 	  @( cd $(topdir) && \
   150 	  @( cd $(topdir) && \
   150 	      $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
   151 	      $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
   151 	      SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
   152 	      SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
   152 	      reconfigure )
   153 	      reconfigure )
   153         else ifeq ($(CONF_CHECK), ignore)
   154         else ifeq ($(CONF_CHECK), ignore)
   264 	  $(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
   265 	  $(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
   265         else
   266         else
   266 	  $(ECHO) "Re-running configure using default settings"
   267 	  $(ECHO) "Re-running configure using default settings"
   267         endif
   268         endif
   268 	( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
   269 	( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
       
   270 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
   269 	    $(BASH) $(CONFIGURE_CMD) $(CONFIGURE_COMMAND_LINE) )
   271 	    $(BASH) $(CONFIGURE_CMD) $(CONFIGURE_COMMAND_LINE) )
   270 
   272 
   271   ##############################################################################
   273   ##############################################################################
   272   # The main target, for delegating into Main.gmk
   274   # The main target, for delegating into Main.gmk
   273   ##############################################################################
   275   ##############################################################################