Print this page
make: unifdef for PARALLEL (undefined, this relates to the old pmake)

*** 234,246 **** Property prop, prop2; struct stat statbuf; int statval; #endif - #ifndef PARALLEL struct stat out_stat, err_stat; - #endif hostid = gethostid(); #ifdef TEAMWARE_MAKE_CMN avo_get_user(NULL, NULL); // Initialize user name #endif bsd_signals(); --- 234,244 ----
*** 414,424 **** tmpdir = strdup(mbs_buffer); } } } - #ifndef PARALLEL /* find out if stdout and stderr point to the same place */ if (fstat(1, &out_stat) < 0) { fatal(catgets(catd, 1, 165, "fstat of standard out failed: %s"), errmsg(errno)); } if (fstat(2, &err_stat) < 0) { --- 412,421 ----
*** 428,440 **** (out_stat.st_ino == err_stat.st_ino)) { stdout_stderr_same = true; } else { stdout_stderr_same = false; } - #else - stdout_stderr_same = false; - #endif /* Make the vroot package scan the path using shell semantics */ set_path_style(0); setup_char_semantics(); --- 425,434 ----
*** 1331,1345 **** argv[i] = (char *)NOCATGETS("-m"); #ifndef TEAMWARE_MAKE_CMN warning(catgets(catd, 1, 285, "Ignoring DistributedMake -m option")); #endif break; - #ifndef PARALLEL case 128: /* -O seen */ argv[i] = (char *)NOCATGETS("-O"); break; - #endif case 256: /* -K seen */ argv[i] = (char *)NOCATGETS("-K"); break; case 512: /* -o seen */ argv[i] = (char *)NOCATGETS("-o"); --- 1325,1337 ----
*** 1695,1715 **** do_not_exec_rule = false; } else { do_not_exec_rule = true; } return 0; - #ifndef PARALLEL case 'O': /* Send job start & result msgs */ if (invert_this) { send_mtool_msgs = false; } else { #ifdef DISTRIBUTED send_mtool_msgs = true; #endif } return 128; - #endif case 'o': /* Use alternative dmake output dir */ if (invert_this) { dmake_odir_specified = false; } else { dmake_odir_specified = true; --- 1687,1705 ----
*** 2205,2215 **** } if (report_cwd) { append_char('w', &makeflags_string); append_char('w', &makeflags_string_posix); } - #ifndef PARALLEL /* -c dmake_rcfile */ if (dmake_rcfile_specified) { MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_RCFILE")); dmake_rcfile = GETNAME(wcs_buffer, FIND_LENGTH); append_makeflags_string(dmake_rcfile, &makeflags_string); --- 2195,2204 ----
*** 2271,2281 **** append_char('R', &makeflags_string); append_char((int) space_char, &makeflags_string_posix); append_char((int) hyphen_char, &makeflags_string_posix); append_char('R', &makeflags_string_posix); } - #endif /* * Make sure MAKEFLAGS is exported */ maybe_append_prop(makeflags, macro_prop)-> --- 2260,2269 ----