distclean more aggressively

webtools/tinderbox3/client/tinderclient.pl

@@ -834,6 +834,15 @@ EOM
   $client->print_log("Set to $ENV{MOZ_OBJDIR}\n");
   $client->end_section("SETTING MOZ_OBJDIR");
 
+  #
+  # Clean non-objdir stuff out
+  #
+  # XXX only the rm -rf is necessary now, this is temporary while I clean out
+  # my personal trees
+  if (-f "Makefile") {
+    $client->do_command("make distclean", $init_tree_status+2);
+  }
+
   #
   # Checkout
   #
@@ -926,11 +935,6 @@ EOM
   #
   if (!$err && (($build_vars->{SHOULD_BUILD} && $config->{clobber}) ||
       $client->eat_command("clobber") || $please_clobber)) {
-    # XXX only the rm -rf is necessary now, this is temporary while I clean out
-    # my personal trees
-    if (-f "Makefile") {
-      $client->do_command("make distclean", $init_tree_status+2);
-    }
     $client->do_command("rm -rf objdir", $init_tree_status+2);
     $build_vars->{SHOULD_BUILD} = 1;
   }