Print this page
make: remove more distributed mode code

@@ -407,52 +407,34 @@
                         warning(catgets(catd, 1, 352, "Unsupported value `%s' for DMAKE_OUTPUT_MODE after -x flag (ignored)"),
                               dmake_value2->string_mb);
                 }
         }
         /*
-         * Find the dmake_mode: distributed, parallel, or serial.
+         * Find the dmake_mode: parallel, or serial.
          */
     if ((!pmake_cap_r_specified) &&
         (!pmake_machinesfile_specified)) {
         MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_MODE"));
         dmake_name2 = GETNAME(wcs_buffer, FIND_LENGTH);
         prop2 = get_prop(dmake_name2->prop, macro_prop);
         if (prop2 == NULL) {
-                /* DMAKE_MODE not defined, default to distributed mode */
-                dmake_mode_type = distributed_mode;
+                /* DMAKE_MODE not defined, default to parallel mode */
+                dmake_mode_type = parallel_mode;
                 no_parallel = false;
         } else {
                 dmake_value2 = prop2->body.macro.value;
-                if ((dmake_value2 == NULL) ||
-                    (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("distributed")))) {
-                        dmake_mode_type = distributed_mode;
-                        no_parallel = false;
-                } else if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("parallel"))) {
+                if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("parallel"))) {
                         dmake_mode_type = parallel_mode;
                         no_parallel = false;
                 } else if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("serial"))) {
                         dmake_mode_type = serial_mode;
                         no_parallel = true;
                 } else {
                         fatal(catgets(catd, 1, 307, "Unknown dmake mode argument `%s' after -m flag"), dmake_value2->string_mb);
                 }
         }
 
-        if ((!list_all_targets) &&
-            (report_dependencies_level == 0)) {
-                /*
-                 * Check to see if either DMAKE_RCFILE or DMAKE_MODE is defined.
-                 * They could be defined in the env, in the makefile, or on the
-                 * command line.
-                 * If neither is defined, and $(HOME)/.dmakerc does not exists,
-                 * then print a message, and default to parallel mode.
-                 */
-                if(dmake_mode_type == distributed_mode) {
-                        dmake_mode_type = parallel_mode;
-                        no_parallel = false;
-                }
-        }
     }
 
         parallel_flag = true;
         putenv(strdup(NOCATGETS("DMAKE_CHILD=TRUE")));
 

@@ -778,11 +760,11 @@
         }
         if (getpid() == getpgrp()) {
                 bsd_signal(SIGTERM, SIG_IGN);
                 kill (-getpid(), SIGTERM);
         }
-        /* Clean up all parallel/distributed children already finished */
+        /* Clean up all parallel children already finished */
         finish_children(false);
 
         /* Make sure the processes running under us terminate first */
 
         while (wait((int *) NULL) != -1);

@@ -1787,14 +1769,10 @@
         sdotmakefile_name = GETNAME(wcs_buffer, FIND_LENGTH);
         MBSTOWCS(wcs_buffer, NOCATGETS("s.Makefile"));
         sdotMakefile = GETNAME(wcs_buffer, FIND_LENGTH);
 
 /*
- *      Set flag if NSE is active
- */
-
-/*
  *      initialize global dependency entry for .NOT_AUTO
  */
         not_auto_depen->next = NULL;
         not_auto_depen->name = not_auto;
         not_auto_depen->automatic = not_auto_depen->stale = false;