make: unifdef for MAKETOOL and DISTRIBUTED (undefined)

@@ -34,17 +34,10 @@
  * Included files
  */
 #include <sys/wait.h>                   /* WIFEXITED(status) */
 #include <alloca.h>             /* alloca() */
 
-#if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL) /* tolik */
-#if defined(DISTRIBUTED)
-#       include <dm/Avo_CmdOutput.h>
-#       include <rw/xdrstrea.h>
-#endif
-#endif
-
 #include <stdio.h>              /* errno */
 #include <errno.h>              /* errno */
 #include <fcntl.h>              /* open() */
 #include <mksh/dosys.h>
 #include <mksh/macro.h>         /* getvar() */

@@ -59,18 +52,11 @@
 
 
 /*
  * Defined macros
  */
-#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
-#define SEND_MTOOL_MSG(cmds) \
-        if (send_mtool_msgs) { \
-                cmds \
-        }
-#else
 #define SEND_MTOOL_MSG(cmds)
-#endif
 
 /*
  * typedefs & structs
  */
 

@@ -570,33 +556,22 @@
  *              filter_file_name The name of the filter file
  *
  *      Global variables used:
  *              filter_stderr   Set if -X is on
  */
-#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
-Boolean
-await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, XDR *xdrs_p, int job_msg_id)
-#else
 Boolean
 await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, void *xdrs_p, int job_msg_id)
-#endif
 {
         int                     status;
         char                    *buffer;
         int                     core_dumped;
         int                     exit_status;
-#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
-        Avo_CmdOutput           *make_output_msg;
-#endif
         FILE                    *outfp;
         register pid_t          pid;
         struct stat             stat_buff;
         int                     termination_signal;
         char                    tmp_buf[MAXPATHLEN];
-#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
-        RWCollectable           *xdr_msg;
-#endif
 
         while ((pid = wait(&status)) != running_pid) {
                 if (pid == -1) {
                         fatal_mksh(catgets(libmksdmsi18n_catd, 1, 98, "wait() failed: %s"), errmsg(errno));
                 }