Print this page
make: unifdef for MAKETOOL and DISTRIBUTED (undefined)
@@ -141,15 +141,11 @@
{
va_list args;
va_start(args, message);
(void) fflush(stdout);
-#ifdef DISTRIBUTED
- (void) fprintf(stderr, catgets(catd, 1, 262, "dmake: Fatal error: "));
-#else
(void) fprintf(stderr, catgets(catd, 1, 263, "make: Fatal error: "));
-#endif
(void) vfprintf(stderr, message, args);
(void) fprintf(stderr, "\n");
va_end(args);
if (report_pwd) {
(void) fprintf(stderr,
@@ -173,19 +169,11 @@
catgets(catd, 1, 158, "job") : catgets(catd, 1, 159, "jobs"));
(void) fflush(stderr);
}
while (parallel_process_cnt > 0) {
-#ifdef DISTRIBUTED
- if (dmake_mode_type == distributed_mode) {
- (void) await_dist(false);
- } else {
- await_parallel(true);
- }
-#else
await_parallel(true);
-#endif
finish_children(false);
}
#endif
#if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
@@ -214,15 +202,11 @@
{
va_list args;
va_start(args, message);
(void) fflush(stdout);
-#ifdef DISTRIBUTED
- (void) fprintf(stderr, catgets(catd, 1, 264, "dmake: Warning: "));
-#else
(void) fprintf(stderr, catgets(catd, 1, 265, "make: Warning: "));
-#endif
(void) vfprintf(stderr, message, args);
(void) fprintf(stderr, "\n");
va_end(args);
if (report_pwd) {
(void) fprintf(stderr,
@@ -282,21 +266,12 @@
if (current_path == NULL) {
getcwd(pwd, sizeof(pwd));
if (pwd[0] == (int) nul_char) {
pwd[0] = (int) slash_char;
pwd[1] = (int) nul_char;
-#ifdef DISTRIBUTED
- current_path = strdup(pwd);
- } else if (IS_EQUALN(pwd, NOCATGETS("/tmp_mnt"), 8)) {
- current_path = strdup(pwd + 8);
- } else {
- current_path = strdup(pwd);
- }
-#else
}
current_path = strdup(pwd);
-#endif
}
return current_path;
}
/*****************************************