Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 59 lines elided ↑ open up ↑
  60   60  
  61   61  #include <sys/types.h>          /* stat() */
  62   62  #include <sys/wait.h>           /* wait() */
  63   63  #include <unistd.h>             /* execv(), unlink(), access() */
  64   64  #include <vroot/report.h>       /* report_dependency(), get_report_file() */
  65   65  
  66   66  // From read2.cc
  67   67  extern  Name            normalize_name(register wchar_t *name_string, register int length);
  68   68  
  69   69  // From parallel.cc
  70      -#if defined(TEAMWARE_MAKE_CMN)
  71   70  #define MAXJOBS_ADJUST_RFE4694000
  72   71  
  73   72  #ifdef MAXJOBS_ADJUST_RFE4694000
  74   73  extern void job_adjust_fini();
  75   74  #endif /* MAXJOBS_ADJUST_RFE4694000 */
  76      -#endif /* TEAMWARE_MAKE_CMN */
  77   75  
  78   76  
  79   77  /*
  80   78   * Defined macros
  81   79   */
  82   80  #define MAKE_PREFIX             NOCATGETS("/usr")
  83   81  #define LD_SUPPORT_ENV_VAR      NOCATGETS("SGS_SUPPORT_32")
  84   82  #define LD_SUPPORT_ENV_VAR_32   NOCATGETS("SGS_SUPPORT_32")
  85   83  #define LD_SUPPORT_ENV_VAR_64   NOCATGETS("SGS_SUPPORT_64")
  86   84  #define LD_SUPPORT_MAKE_LIB     NOCATGETS("libmakestate.so.1")
↓ open down ↓ 27 lines elided ↑ open up ↑
 114  112  static  Dependency      not_auto_depen = &not_auto_depen_struct;
 115  113  static  Boolean         pmake_cap_r_specified;          /* `-R' */
 116  114  static  Boolean         pmake_machinesfile_specified;   /* `-M' */
 117  115  static  Boolean         stop_after_error_ever_seen;     /* `-S' */
 118  116  static  Boolean         trace_status;                   /* `-p' */
 119  117  
 120  118  #ifdef DMAKE_STATISTICS
 121  119  static  Boolean         getname_stat = false;
 122  120  #endif
 123  121  
 124      -#if defined(TEAMWARE_MAKE_CMN)
 125  122          static  time_t          start_time;
 126  123          static  int             g_argc;
 127  124          static  char            **g_argv;
 128      -#endif
 129  125  
 130  126  /*
 131  127   * File table of contents
 132  128   */
 133  129          extern "C" void         cleanup_after_exit(void);
 134  130  
 135      -#ifdef TEAMWARE_MAKE_CMN
 136  131  extern "C" {
 137  132          extern  void            dmake_exit_callback(void);
 138  133          extern  void            dmake_message_callback(char *);
 139  134  }
 140      -#endif
 141  135  
 142  136  extern  Name            normalize_name(register wchar_t *name_string, register int length);
 143  137  
 144  138  extern  int             main(int, char * []);
 145  139  
 146  140  static  void            append_makeflags_string(Name, String);
 147  141  static  void            doalarm(int);
 148  142  static  void            enter_argv_values(int , char **, ASCII_Dyn_Array *);
 149  143  static  void            make_targets(int, char **, Boolean);
 150  144  static  int             parse_command_option(char);
↓ open down ↓ 2 lines elided ↑ open up ↑
 153  147  static  void            read_files_and_state(int, char **);
 154  148  static  Boolean         read_makefile(Name, Boolean, Boolean, Boolean);
 155  149  static  void            report_recursion(Name);
 156  150  static  void            set_sgs_support(void);
 157  151  static  void            setup_for_projectdir(void);
 158  152  static  void            setup_makeflags_argv(void);
 159  153  static  void            report_dir_enter_leave(Boolean entering);
 160  154  
 161  155  extern void expand_value(Name, register String , Boolean);
 162  156  
 163      -#ifdef TEAMWARE_MAKE_CMN
 164      -        static const char       verstring[] = "illumos make";
 165      -#endif
      157 +static const char       verstring[] = "illumos make";
 166  158  
 167  159  jmp_buf jmpbuffer;
 168  160  extern nl_catd catd;
 169  161  
 170  162  /*
 171  163   *      main(argc, argv)
 172  164   *
 173  165   *      Parameters:
 174  166   *              argc                    You know what this is
 175  167   *              argv                    You know what this is
↓ open down ↓ 21 lines elided ↑ open up ↑
 197  189           * cp is a -> to the value of the MAKEFLAGS env var,
 198  190           * which has to be regular chars.
 199  191           */
 200  192          register char           *cp;
 201  193          char                    make_state_dir[MAXPATHLEN];
 202  194          Boolean                 parallel_flag = false;
 203  195          char                    *prognameptr;
 204  196          char                    *slash_ptr;
 205  197          mode_t                  um;
 206  198          int                     i;
 207      -#ifdef TEAMWARE_MAKE_CMN
 208  199          struct itimerval        value;
 209  200          char                    def_dmakerc_path[MAXPATHLEN];
 210  201          Name                    dmake_name, dmake_name2;
 211  202          Name                    dmake_value, dmake_value2;
 212  203          Property                prop, prop2;
 213  204          struct stat             statbuf;
 214  205          int                     statval;
 215      -#endif
 216  206  
 217  207          struct stat             out_stat, err_stat;
 218  208          hostid = gethostid();
 219  209          bsd_signals();
 220  210  
 221  211          (void) setlocale(LC_ALL, "");
 222  212  
 223  213  
 224  214  #ifdef DMAKE_STATISTICS
 225  215          if (getenv(NOCATGETS("DMAKE_STATISTICS"))) {
 226  216                  getname_stat = true;
 227  217          }
 228  218  #endif
 229  219  
 230      -#if defined(TEAMWARE_MAKE_CMN)
 231  220          catd = catopen(AVO_DOMAIN_DMAKE, NL_CAT_LOCALE);
 232      -#endif
 233  221  
 234  222  // ---> fprintf(stderr, catgets(catd, 15, 666, "--- SUN make ---\n"));
 235  223  
 236  224  
 237      -#if defined(TEAMWARE_MAKE_CMN)
 238  225  /*
 239  226   * I put libmksdmsi18n_init() under #ifdef because it requires avo_i18n_init()
 240  227   * from avo_util library. 
 241  228   */
 242  229          libmksdmsi18n_init();
 243      -#endif
 244  230  
 245  231  
 246      -#ifndef TEAMWARE_MAKE_CMN
 247  232          textdomain(NOCATGETS("SUNW_SPRO_MAKE"));
 248      -#endif /* TEAMWARE_MAKE_CMN */
 249  233  
 250      -#ifdef TEAMWARE_MAKE_CMN
 251  234          g_argc = argc;
 252  235          g_argv = (char **) malloc((g_argc + 1) * sizeof(char *));
 253  236          for (i = 0; i < argc; i++) {
 254  237                  g_argv[i] = argv[i];
 255  238          }
 256  239          g_argv[i] = NULL;
 257      -#endif /* TEAMWARE_MAKE_CMN */
 258  240  
 259  241          /*
 260  242           * Set argv_zero_string to some form of argv[0] for
 261  243           * recursive MAKE builds.
 262  244           */
 263  245  
 264  246          if (*argv[0] == (int) slash_char) {
 265  247                  /* argv[0] starts with a slash */
 266  248                  argv_zero_string = strdup(argv[0]);
 267  249          } else if (strchr(argv[0], (int) slash_char) == NULL) {
↓ open down ↓ 128 lines elided ↑ open up ↑
 396  378          read_command_options(argc, argv);
 397  379          if (debug_level > 0) {
 398  380                  cp = getenv(makeflags->string_mb);
 399  381                  (void) printf(catgets(catd, 1, 167, "MAKEFLAGS value: %s\n"), cp == NULL ? "" : cp);
 400  382          }
 401  383  
 402  384          setup_interrupt(handle_interrupt);
 403  385  
 404  386          read_files_and_state(argc, argv);
 405  387  
 406      -#ifdef TEAMWARE_MAKE_CMN
 407  388          /*
 408  389           * Find the dmake_output_mode: TXT1, TXT2 or HTML1.
 409  390           */
 410  391          MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_OUTPUT_MODE"));
 411  392          dmake_name2 = GETNAME(wcs_buffer, FIND_LENGTH);
 412  393          prop2 = get_prop(dmake_name2->prop, macro_prop);
 413  394          if (prop2 == NULL) {
 414  395                  /* DMAKE_OUTPUT_MODE not defined, default to TXT1 mode */
 415  396                  output_mode = txt1_mode;
 416  397          } else {
↓ open down ↓ 47 lines elided ↑ open up ↑
 464  445                   * command line.
 465  446                   * If neither is defined, and $(HOME)/.dmakerc does not exists,
 466  447                   * then print a message, and default to parallel mode.
 467  448                   */
 468  449                  if(dmake_mode_type == distributed_mode) {
 469  450                          dmake_mode_type = parallel_mode;
 470  451                          no_parallel = false;
 471  452                  }
 472  453          }
 473  454      }
 474      -#endif
 475  455  
 476      -#ifdef TEAMWARE_MAKE_CMN
 477  456          parallel_flag = true;
 478  457          putenv(strdup(NOCATGETS("DMAKE_CHILD=TRUE")));
 479  458  
 480  459  //
 481  460  // If dmake is running with -t option, set dmake_mode_type to serial.
 482  461  // This is done because doname() calls touch_command() that runs serially.
 483  462  // If we do not do that, maketool will have problems. 
 484  463  //
 485  464          if(touch) {
 486  465                  dmake_mode_type = serial_mode;
 487  466                  no_parallel = true;
 488  467          }
 489      -#else
 490      -        parallel_flag = false;
 491      -#endif
 492  468  
 493      -#if defined (TEAMWARE_MAKE_CMN)
 494  469          /*
 495  470           * Check whether stdout and stderr are physically same.
 496  471           * This is in order to decide whether we need to redirect
 497  472           * stderr separately from stdout.
 498  473           * This check is performed only if __DMAKE_SEPARATE_STDERR
 499  474           * is not set. This variable may be used in order to preserve
 500  475           * the 'old' behaviour.
 501  476           */
 502  477          out_err_same = true;
 503  478          char * dmake_sep_var = getenv(NOCATGETS("__DMAKE_SEPARATE_STDERR"));
↓ open down ↓ 3 lines elided ↑ open up ↑
 507  482                  if( (fstat(1, &stdout_stat) == 0)
 508  483                   && (fstat(2, &stderr_stat) == 0) )
 509  484                  {
 510  485                          if( (stdout_stat.st_dev != stderr_stat.st_dev)
 511  486                           || (stdout_stat.st_ino != stderr_stat.st_ino) )
 512  487                          {
 513  488                                  out_err_same = false;
 514  489                          }
 515  490                  }
 516  491          }
 517      -#endif
 518  492  
 519  493                  
 520  494  /*
 521  495   *      Enable interrupt handler for alarms
 522  496   */
 523  497          (void) bsd_signal(SIGALRM, (SIG_PF)doalarm);
 524  498  
 525  499  /*
 526  500   *      Check if make should report
 527  501   */
↓ open down ↓ 156 lines elided ↑ open up ↑
 684  658          parallel = false;
 685  659          /* If we used the SVR4_MAKE, don't build .DONE or .FAILED */
 686  660          if (!getenv(USE_SVR4_MAKE)){
 687  661              /* Build the target .DONE or .FAILED if we caught an error */
 688  662              if (!quest && !list_all_targets) {
 689  663                  Name            failed_name;
 690  664  
 691  665                  MBSTOWCS(wcs_buffer, NOCATGETS(".FAILED"));
 692  666                  failed_name = GETNAME(wcs_buffer, FIND_LENGTH);
 693  667                  if ((exit_status != 0) && (failed_name->prop != NULL)) {
 694      -#ifdef TEAMWARE_MAKE_CMN
 695  668                          /*
 696  669                           * [tolik] switch DMake to serial mode
 697  670                           */
 698  671                          dmake_mode_type = serial_mode;
 699  672                          no_parallel = true;
 700      -#endif
 701  673                          (void) doname(failed_name, false, true);
 702  674                  } else {
 703  675                      if (!trace_status) {
 704      -#ifdef TEAMWARE_MAKE_CMN
 705  676                          /*
 706  677                           * Switch DMake to serial mode
 707  678                           */
 708  679                          dmake_mode_type = serial_mode;
 709  680                          no_parallel = true;
 710      -#endif
 711  681                          (void) doname(done, false, true);
 712  682                      }
 713  683                  }
 714  684              }
 715  685          }
 716  686          /*
 717  687           * Remove the temp file utilities report dependencies thru if it
 718  688           * is still around
 719  689           */
 720  690          if (temp_file_name != NULL) {
↓ open down ↓ 82 lines elided ↑ open up ↑
 803  773                  }
 804  774                  if (rp->pid > 0) {
 805  775                          kill(rp->pid, SIGTERM);
 806  776                          rp->pid = -1;
 807  777                  }
 808  778          }
 809  779          if (getpid() == getpgrp()) {
 810  780                  bsd_signal(SIGTERM, SIG_IGN);
 811  781                  kill (-getpid(), SIGTERM);
 812  782          }
 813      -#ifdef TEAMWARE_MAKE_CMN
 814  783          /* Clean up all parallel/distributed children already finished */
 815  784          finish_children(false);
 816      -#endif
 817  785  
 818  786          /* Make sure the processes running under us terminate first */
 819  787  
 820  788          while (wait((int *) NULL) != -1);
 821  789          /* Delete the current targets unless they are precious */
 822  790          if ((current_target != NULL) &&
 823  791              current_target->is_member &&
 824  792              ((member = get_prop(current_target->prop, member_prop)) != NULL)) {
 825  793                  current_target = member->body.member.library;
 826  794          }
↓ open down ↓ 131 lines elided ↑ open up ↑
 958  926                                                      * -c, f, g, j, m, o
 959  927                                                      */
 960  928          const char              *tptr;
 961  929          const char              *CMD_OPTS;
 962  930  
 963  931          extern char             *optarg;
 964  932          extern int              optind, opterr, optopt;
 965  933  
 966  934  #define SUNPRO_CMD_OPTS "-~Bbc:Ddef:g:ij:K:kM:m:NnO:o:PpqRrSsTtuVvwx:"
 967  935  
 968      -#ifdef TEAMWARE_MAKE_CMN
 969  936  #       define SVR4_CMD_OPTS   "-c:ef:g:ij:km:nO:o:pqrsTtVv"
 970      -#else
 971      -#       define SVR4_CMD_OPTS   "-ef:iknpqrstV"
 972      -#endif
 973  937  
 974  938          /*
 975  939           * Added V in SVR4_CMD_OPTS also, which is going to be a hidden
 976  940           * option, just to make sure that the getopt doesn't fail when some
 977  941           * users leave their USE_SVR4_MAKE set and try to use the makefiles
 978  942           * that are designed to issue commands like $(MAKE) -V. Anyway it
 979  943           * sets the same flag but ensures that getopt doesn't fail.
 980  944           */
 981  945  
 982  946          opterr = 0;
↓ open down ↓ 56 lines elided ↑ open up ↑
1039 1003                                          }
1040 1004                                        }
1041 1005                                      }
1042 1006                                    }
1043 1007                                  }
1044 1008                          }
1045 1009                  }
1046 1010  
1047 1011                  if (ch == '?') {
1048 1012                          if (svr4) {
1049      -#ifdef TEAMWARE_MAKE_CMN
1050 1013                                  fprintf(stderr,
1051 1014                                          catgets(catd, 1, 267, "Usage : dmake [ -f makefile ][ -c dmake_rcfile ][ -g dmake_group ]\n"));
1052 1015                                  fprintf(stderr,
1053 1016                                          catgets(catd, 1, 268, "              [ -j dmake_max_jobs ][ -m dmake_mode ][ -o dmake_odir ]...\n"));
1054 1017                                  fprintf(stderr,
1055 1018                                          catgets(catd, 1, 269, "              [ -e ][ -i ][ -k ][ -n ][ -p ][ -q ][ -r ][ -s ][ -t ][ -v ]\n"));
1056      -#else
1057      -                                fprintf(stderr,
1058      -                                        catgets(catd, 1, 270, "Usage : make [ -f makefile ]... [ -e ][ -i ][ -k ][ -n ][ -p ][ -q ][ -r ]\n"));
1059      -                                fprintf(stderr,
1060      -                                        catgets(catd, 1, 271, "             [ -s ][ -t ]\n"));
1061      -#endif
1062 1019                                  tptr = strchr(SVR4_CMD_OPTS, optopt);
1063 1020                          } else {
1064      -#ifdef TEAMWARE_MAKE_CMN
1065 1021                                  fprintf(stderr,
1066 1022                                          catgets(catd, 1, 272, "Usage : dmake [ -f makefile ][ -c dmake_rcfile ][ -g dmake_group ]\n"));
1067 1023                                  fprintf(stderr,
1068 1024                                          catgets(catd, 1, 273, "              [ -j dmake_max_jobs ][ -K statefile ][ -m dmake_mode ][ -x MODE_NAME=VALUE ][ -o dmake_odir ]...\n"));
1069 1025                                  fprintf(stderr,
1070 1026                                          catgets(catd, 1, 274, "              [ -d ][ -dd ][ -D ][ -DD ][ -e ][ -i ][ -k ][ -n ][ -p ][ -P ][ -u ][ -w ]\n"));
1071 1027                                  fprintf(stderr,
1072 1028                                          catgets(catd, 1, 275, "              [ -q ][ -r ][ -s ][ -S ][ -t ][ -v ][ -V ][ target... ][ macro=value... ][ \"macro +=value\"... ]\n"));
1073      -#else
1074      -                                fprintf(stderr,
1075      -                                        catgets(catd, 1, 276, "Usage : make [ -f makefile ][ -K statefile ]... [ -d ][ -dd ][ -D ][ -DD ]\n"));
1076      -                                fprintf(stderr,
1077      -                                        catgets(catd, 1, 277, "             [ -e ][ -i ][ -k ][ -n ][ -p ][ -P ][ -q ][ -r ][ -s ][ -S ][ -t ]\n"));
1078      -                                fprintf(stderr,
1079      -                                        catgets(catd, 1, 278, "             [ -u ][ -w ][ -V ][ target... ][ macro=value... ][ \"macro +=value\"... ]\n"));
1080      -#endif
1081 1029                                  tptr = strchr(SUNPRO_CMD_OPTS, optopt);
1082 1030                          }
1083 1031                          if (!tptr) {
1084 1032                                  fatal(catgets(catd, 1, 279, "Unknown option `-%c'"), optopt);
1085 1033                          } else {
1086 1034                                  fatal(catgets(catd, 1, 280, "Missing argument after `-%c'"), optopt);
1087 1035                          }
1088 1036                  }
1089 1037  
1090 1038  
↓ open down ↓ 16 lines elided ↑ open up ↑
1107 1055                                  /* This shouldn't happen */
1108 1056                                  if (k) {
1109 1057                                          argv[k] = NULL;
1110 1058                                  }
1111 1059                                  break;
1112 1060                          case 1: /* -f seen */
1113 1061                                  argv[i] = (char *)NOCATGETS("-f");
1114 1062                                  break;
1115 1063                          case 2: /* -c seen */
1116 1064                                  argv[i] = (char *)NOCATGETS("-c");
1117      -#ifndef TEAMWARE_MAKE_CMN
1118      -                                warning(catgets(catd, 1, 281, "Ignoring DistributedMake -c option"));
1119      -#endif
1120 1065                                  break;
1121 1066                          case 4: /* -g seen */
1122 1067                                  argv[i] = (char *)NOCATGETS("-g");
1123      -#ifndef TEAMWARE_MAKE_CMN
1124      -                                warning(catgets(catd, 1, 282, "Ignoring DistributedMake -g option"));
1125      -#endif
1126 1068                                  break;
1127 1069                          case 8: /* -j seen */
1128 1070                                  argv[i] = (char *)NOCATGETS("-j");
1129      -#ifndef TEAMWARE_MAKE_CMN
1130      -                                warning(catgets(catd, 1, 283, "Ignoring DistributedMake -j option"));
1131      -#endif
1132 1071                                  break;
1133 1072                          case 16: /* -M seen */
1134 1073                                  argv[i] = (char *)NOCATGETS("-M");
1135      -#ifndef TEAMWARE_MAKE_CMN
1136      -                                warning(catgets(catd, 1, 284, "Ignoring ParallelMake -M option"));
1137      -#endif
1138 1074                                  break;
1139 1075                          case 32: /* -m seen */
1140 1076                                  argv[i] = (char *)NOCATGETS("-m");
1141      -#ifndef TEAMWARE_MAKE_CMN
1142      -                                warning(catgets(catd, 1, 285, "Ignoring DistributedMake -m option"));
1143      -#endif
1144 1077                                  break;
1145 1078                          case 128: /* -O seen */
1146 1079                                  argv[i] = (char *)NOCATGETS("-O");
1147 1080                                  break;
1148 1081                          case 256: /* -K seen */
1149 1082                                  argv[i] = (char *)NOCATGETS("-K");
1150 1083                                  break;
1151 1084                          case 512:       /* -o seen */
1152 1085                                  argv[i] = (char *)NOCATGETS("-o");
1153      -#ifndef TEAMWARE_MAKE_CMN
1154      -                                warning(catgets(catd, 1, 311, "Ignoring DistributedMake -o option"));
1155      -#endif
1156 1086                                  break;
1157 1087                          case 1024: /* -x seen */
1158 1088                                  argv[i] = (char *)NOCATGETS("-x");
1159      -#ifndef TEAMWARE_MAKE_CMN
1160      -                                warning(catgets(catd, 1, 353, "Ignoring DistributedMake -x option"));
1161      -#endif
1162 1089                                  break;
1163 1090                          default: /* > 1 of -c, f, g, j, K, M, m, O, o, x seen */
1164 1091                                  fatal(catgets(catd, 1, 286, "Illegal command line. More than one option requiring\nan argument given in the same argument group"));
1165 1092                          }
1166 1093  
1167 1094                          makefile_next = 0;
1168 1095                          current_optind = optind;
1169 1096                  }
1170 1097          }
1171 1098  }
↓ open down ↓ 362 lines elided ↑ open up ↑
1534 1461                  }
1535 1462                  return 0;
1536 1463          case 'q':                        /* Question flag */
1537 1464                  if (invert_this) {
1538 1465                          quest = false;
1539 1466                  } else {
1540 1467                          quest = true;
1541 1468                  }
1542 1469                  return 0;
1543 1470          case 'R':                        /* Don't run in parallel */
1544      -#ifdef TEAMWARE_MAKE_CMN
1545 1471                  if (invert_this) {
1546 1472                          pmake_cap_r_specified = false;
1547 1473                          no_parallel = false;
1548 1474                  } else {
1549 1475                          pmake_cap_r_specified = true;
1550 1476                          dmake_mode_type = serial_mode;
1551 1477                          no_parallel = true;
1552 1478                  }
1553      -#else
1554      -                warning(catgets(catd, 1, 182, "Ignoring ParallelMake -R option"));
1555      -#endif
1556 1479                  return 0;
1557 1480          case 'r':                        /* Turn off internal rules */
1558 1481                  if (invert_this) {
1559 1482                          ignore_default_mk = false;
1560 1483                  } else {
1561 1484                          ignore_default_mk = true;
1562 1485                  }
1563 1486                  return 0;
1564 1487          case 'S':                        /* Reverse -k */
1565 1488                  if (invert_this) {
↓ open down ↓ 32 lines elided ↑ open up ↑
1598 1521                  } else {
1599 1522                          build_unconditional = true;
1600 1523                  }
1601 1524                  return 0;
1602 1525          case 'V':                       /* SVR4 mode */
1603 1526                  svr4 = true;
1604 1527                  return 0;
1605 1528          case 'v':                       /* Version flag */
1606 1529                  if (invert_this) {
1607 1530                  } else {
1608      -#ifdef TEAMWARE_MAKE_CMN
1609 1531                          fprintf(stdout, NOCATGETS("dmake: %s\n"), verstring);
1610 1532                          exit_status = 0;
1611 1533                          exit(0);
1612      -#else
1613      -                        warning(catgets(catd, 1, 324, "Ignoring DistributedMake -v option"));
1614      -#endif
1615 1534                  }
1616 1535                  return 0;
1617 1536          case 'w':                        /* Unconditional flag */
1618 1537                  if (invert_this) {
1619 1538                          report_cwd = false;
1620 1539                  } else {
1621 1540                          report_cwd = true;
1622 1541                  }
1623 1542                  return 0;
1624 1543  #if 0
↓ open down ↓ 1244 lines elided ↑ open up ↑
2869 2788          char                    *cp;
2870 2789          Doname                  result;
2871 2790          register Boolean        target_to_make_found = false;
2872 2791  
2873 2792          (void) doname(init, true, true);
2874 2793          recursion_level = 1;
2875 2794          parallel = parallel_flag;
2876 2795  /*
2877 2796   *      make remaining args
2878 2797   */
2879      -#ifdef TEAMWARE_MAKE_CMN
2880 2798  /*
2881 2799          if ((report_dependencies_level == 0) && parallel) {
2882 2800   */
2883 2801          if (parallel) {
2884 2802                  /*
2885 2803                   * If building targets in parallel, start all of the
2886 2804                   * remaining args to build in parallel.
2887 2805                   */
2888 2806                  for (i = 1; i < argc; i++) {
2889 2807                          if ((cp = argv[i]) != NULL) {
↓ open down ↓ 60 lines elided ↑ open up ↑
2950 2868                                                  }
2951 2869                                          }
2952 2870                                  }
2953 2871                          }
2954 2872                  }
2955 2873                  /* Now wait for all of the targets to finish running */
2956 2874                  finish_running();
2957 2875                  //              setjmp(jmpbuffer);
2958 2876                  
2959 2877          }
2960      -#endif
2961 2878          for (i = 1; i < argc; i++) {
2962 2879                  if ((cp = argv[i]) != NULL) {
2963 2880                          target_to_make_found = true;
2964 2881                          if ((cp[0] == (int) period_char) &&
2965 2882                              (cp[1] == (int) slash_char)) {
2966 2883                                  cp += 2;
2967 2884                          }
2968 2885                                   if((cp[0] == (int) ' ') &&
2969 2886                                      (cp[1] == (int) '-') &&
2970 2887                                      (cp[2] == (int) ' ') &&
↓ open down ↓ 71 lines elided ↑ open up ↑
3042 2959                  top_level_target = get_wstring(default_target_to_build->string_mb);
3043 2960                  report_recursion(default_target_to_build);
3044 2961  
3045 2962  
3046 2963                  if (getenv(NOCATGETS("SPRO_EXPAND_ERRORS"))){
3047 2964                          (void) printf(NOCATGETS("::(%s)\n"),
3048 2965                                        default_target_to_build->string_mb);
3049 2966                  }
3050 2967  
3051 2968  
3052      -#ifdef TEAMWARE_MAKE_CMN
3053 2969                  result = doname_parallel(default_target_to_build, true, false);
3054      -#else
3055      -                result = doname_check(default_target_to_build, true,
3056      -                                      false, false);
3057      -#endif
3058 2970                  gather_recursive_deps();
3059 2971                  if (build_failed_seen) {
3060 2972                          build_failed_ever_seen = true;
3061 2973                          warning(catgets(catd, 1, 203, "Target `%s' not remade because of errors"),
3062 2974                                  default_target_to_build->string_mb);
3063 2975                  }
3064 2976                  build_failed_seen = false;
3065 2977                  if (report_dependencies_level > 0) {
3066 2978                          print_dependencies(default_target_to_build,
3067 2979                                             get_prop(default_target_to_build->
↓ open down ↓ 247 lines elided ↑ open up ↑
3315 3227                  sprintf(mlev, NOCATGETS("MAKELEVEL=%d"), make_level_val + 1);
3316 3228          } else {
3317 3229                  make_level_val--;
3318 3230                  sprintf(mlev, NOCATGETS("MAKELEVEL=%d"), make_level_val);
3319 3231          }
3320 3232          putenv(mlev);
3321 3233  
3322 3234          if(report_cwd) {
3323 3235                  if(make_level_val <= 0) {
3324 3236                          if(entering) {
3325      -#ifdef TEAMWARE_MAKE_CMN
3326 3237                                  sprintf( rcwd
3327 3238                                         , catgets(catd, 1, 329, "dmake: Entering directory `%s'\n")
3328 3239                                         , get_current_path());
3329      -#else
3330      -                                sprintf( rcwd
3331      -                                       , catgets(catd, 1, 330, "make: Entering directory `%s'\n")
3332      -                                       , get_current_path());
3333      -#endif
3334 3240                          } else {
3335      -#ifdef TEAMWARE_MAKE_CMN
3336 3241                                  sprintf( rcwd
3337 3242                                         , catgets(catd, 1, 331, "dmake: Leaving directory `%s'\n")
3338 3243                                         , get_current_path());
3339      -#else
3340      -                                sprintf( rcwd
3341      -                                       , catgets(catd, 1, 332, "make: Leaving directory `%s'\n")
3342      -                                       , get_current_path());
3343      -#endif
3344 3244                          }
3345 3245                  } else {
3346 3246                          if(entering) {
3347      -#ifdef TEAMWARE_MAKE_CMN
3348 3247                                  sprintf( rcwd
3349 3248                                         , catgets(catd, 1, 333, "dmake[%d]: Entering directory `%s'\n")
3350 3249                                         , make_level_val, get_current_path());
3351      -#else
3352      -                                sprintf( rcwd
3353      -                                       , catgets(catd, 1, 334, "make[%d]: Entering directory `%s'\n")
3354      -                                       , make_level_val, get_current_path());
3355      -#endif
3356 3250                          } else {
3357      -#ifdef TEAMWARE_MAKE_CMN
3358 3251                                  sprintf( rcwd
3359 3252                                         , catgets(catd, 1, 335, "dmake[%d]: Leaving directory `%s'\n")
3360 3253                                         , make_level_val, get_current_path());
3361      -#else
3362      -                                sprintf( rcwd
3363      -                                       , catgets(catd, 1, 336, "make[%d]: Leaving directory `%s'\n")
3364      -                                       , make_level_val, get_current_path());
3365      -#endif
3366 3254                          }
3367 3255                  }
3368 3256                  printf(NOCATGETS("%s"), rcwd);
3369 3257          }
3370 3258  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX