Revert Bug 656049, as one clean cset. r=bustage
authorJustin Wood <Callek@gmail.com>
Wed, 13 Jul 2011 02:20:29 -0400
changeset 8558 f78f865e5fad62b1e566d42eb411594e05376400
parent 8557 f66eb5d6026dc5ac169ec0a287590248d67e1306
child 8559 004c3d95bb3e6c85c5fcc898bb21132a68824147
push idunknown
push userunknown
push dateunknown
reviewersbustage
bugs656049
Revert Bug 656049, as one clean cset. r=bustage
client.mk
--- a/client.mk
+++ b/client.mk
@@ -134,17 +134,17 @@ endif
 
 MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
 MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find
 MOZCONFIG_MODULES := mozilla/build/unix/uniq.pl
 
 run_for_side_effects := \
   $(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) $(TOPSRCDIR)/.mozconfig.mk > $(TOPSRCDIR)/.mozconfig.out)
 
-sinclude $(TOPSRCDIR)/.mozconfig.mk
+include $(TOPSRCDIR)/.mozconfig.mk
 
 ifndef MOZ_OBJDIR
   MOZ_OBJDIR = obj-$(CONFIG_GUESS)
 endif
 
 ifdef MOZ_BUILD_PROJECTS
 
 ifdef MOZ_CURRENT_PROJECT
@@ -169,24 +169,16 @@ CONFIGURES += $(TOPSRCDIR)/mozilla/confi
 CONFIGURES += $(TOPSRCDIR)/mozilla/js/src/configure
 
 #######################################################################
 # Rules
 
 # The default rule is build
 build::
 
-# These targets are candidates for auto-running client.py
-ifndef NO_CLIENT_PY
-$(TOPSRCDIR)/.mozconfig.mk:: run_client_py
-	$(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) $(TOPSRCDIR)/.mozconfig.mk > $(TOPSRCDIR)/.mozconfig.out
-build 	  		:: run_client_py
-configure 		:: run_client_py
-endif
-
 # Print out any options loaded from mozconfig.
 all build clean depend distclean export libs install realclean::
 	@if test -f .mozconfig.out; then \
 	  cat .mozconfig.out; \
 	  rm -f .mozconfig.out; \
 	else true; \
 	fi
 
@@ -320,17 +312,17 @@ endif
 	@echo cd $(OBJDIR);
 	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
 	@cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
 	  || ( echo "*** Fix above errors and then restart with\
                \"$(MAKE) -f client.mk build\"" && exit 1 )
 	@touch $(OBJDIR)/Makefile
 
 $(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
-	@$(MAKE) -f $(TOPSRCDIR)/client.mk configure NO_CLIENT_PY=1
+	@$(MAKE) -f $(TOPSRCDIR)/client.mk configure
 
 ifneq (,$(CONFIG_STATUS))
 $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
 	cd $(OBJDIR); \
 	  CONFIG_FILES=config/autoconf.mk ./config.status
 endif
 
 
@@ -407,26 +399,17 @@ cleansrcdir:
 	else \
 	  echo "Removing object files from srcdir..."; \
 	  rm -fr `find . -type d \( -name .deps -print -o -name CVS \
 	          -o -exec test ! -d {}/CVS \; \) -prune \
 	          -o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
 	   build/autoconf/clean-config.sh; \
 	fi;
 
-checkout co:
-	@$(PYTHON) $(TOPSRCDIR)/build/run_client.py --force --make $(MAKE) $(TOPSRCDIR)
-
-run_client_py:
-	@$(PYTHON) $(TOPSRCDIR)/build/run_client.py --make $(MAKE) $(TOPSRCDIR)
-
-print_mk_add_options:
-	@$(TOPSRCDIR)/build/print_mk_add_options.sh
-
 echo-variable-%:
 	@echo $($*)
 
 # This makefile doesn't support parallel execution. It does pass
 # MOZ_MAKE_FLAGS to sub-make processes, so they will correctly execute
 # in parallel.
 .NOTPARALLEL:
 
-.PHONY: run_client_py print_mk_add_options checkout co real_checkout depend build profiledbuild maybe_clobber_profiledbuild export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all
+.PHONY: checkout real_checkout depend build profiledbuild maybe_clobber_profiledbuild export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all