--- a/client.mk
+++ b/client.mk
@@ -76,19 +76,16 @@ endif
 endif
 
 MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
 
 # 'configure' scripts generated by autoconf.
 CONFIGURES := $(TOPSRCDIR)/configure
 CONFIGURES += $(TOPSRCDIR)/js/src/configure
 
-# Make targets that are going to be passed to the real build system
-OBJDIR_TARGETS = install export libs clean realclean distclean upload sdk installer package package-compare stage-package source-package l10n-check automation/build
-
 #######################################################################
 # Rules
 
 # The default rule is build
 build::
 
 ifndef MACH
 $(error client.mk must be used via `mach`. Try running \
@@ -221,35 +218,27 @@ ifneq (,$(CONFIG_STATUS))
 endif
 
 ####################################
 # Build it
 
 build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	+$(MOZ_MAKE)
 
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-$(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	+$(MOZ_MAKE) $@
-
 ifdef MOZ_AUTOMATION
 build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk automation/build
+	+$(MOZ_MAKE) automation/build
 endif
 
 ifdef MOZBUILD_MANAGE_SCCACHE_DAEMON
 build::
 	# Terminate sccache server. This prints sccache stats.
 	-$(MOZBUILD_MANAGE_SCCACHE_DAEMON) --stop-server
 endif
 
 # 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: \
     build \
-    configure \
-    $(OBJDIR_TARGETS)
+    configure