Print this page
make: fix GCC warnings
*** 206,216 ****
extern char verstring[];
#endif
jmp_buf jmpbuffer;
#if !defined(linux)
! nl_catd catd;
#endif
/*
* main(argc, argv)
*
--- 206,216 ----
extern char verstring[];
#endif
jmp_buf jmpbuffer;
#if !defined(linux)
! extern nl_catd catd;
#endif
/*
* main(argc, argv)
*
*** 1445,1502 ****
if (k) {
argv[k] = NULL;
}
break;
case 1: /* -f seen */
! argv[i] = NOCATGETS("-f");
break;
case 2: /* -c seen */
! argv[i] = NOCATGETS("-c");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 281, "Ignoring DistributedMake -c option"));
#endif
break;
case 4: /* -g seen */
! argv[i] = NOCATGETS("-g");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 282, "Ignoring DistributedMake -g option"));
#endif
break;
case 8: /* -j seen */
! argv[i] = NOCATGETS("-j");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 283, "Ignoring DistributedMake -j option"));
#endif
break;
case 16: /* -M seen */
! argv[i] = NOCATGETS("-M");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 284, "Ignoring ParallelMake -M option"));
#endif
break;
case 32: /* -m seen */
! argv[i] = 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] = NOCATGETS("-O");
break;
#endif
case 256: /* -K seen */
! argv[i] = NOCATGETS("-K");
break;
case 512: /* -o seen */
! argv[i] = NOCATGETS("-o");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 311, "Ignoring DistributedMake -o option"));
#endif
break;
case 1024: /* -x seen */
! argv[i] = NOCATGETS("-x");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 353, "Ignoring DistributedMake -x option"));
#endif
break;
default: /* > 1 of -c, f, g, j, K, M, m, O, o, x seen */
--- 1445,1502 ----
if (k) {
argv[k] = NULL;
}
break;
case 1: /* -f seen */
! argv[i] = (char *)NOCATGETS("-f");
break;
case 2: /* -c seen */
! argv[i] = (char *)NOCATGETS("-c");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 281, "Ignoring DistributedMake -c option"));
#endif
break;
case 4: /* -g seen */
! argv[i] = (char *)NOCATGETS("-g");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 282, "Ignoring DistributedMake -g option"));
#endif
break;
case 8: /* -j seen */
! argv[i] = (char *)NOCATGETS("-j");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 283, "Ignoring DistributedMake -j option"));
#endif
break;
case 16: /* -M seen */
! argv[i] = (char *)NOCATGETS("-M");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 284, "Ignoring ParallelMake -M option"));
#endif
break;
case 32: /* -m seen */
! 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");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 311, "Ignoring DistributedMake -o option"));
#endif
break;
case 1024: /* -x seen */
! argv[i] = (char *)NOCATGETS("-x");
#ifndef TEAMWARE_MAKE_CMN
warning(catgets(catd, 1, 353, "Ignoring DistributedMake -x option"));
#endif
break;
default: /* > 1 of -c, f, g, j, K, M, m, O, o, x seen */
*** 1648,1658 ****
}
}
}
/* Allocate memory for the new MAKEFLAGS argv */
mf_argv = (char **) malloc((mf_argc + 1) * sizeof(char *));
! mf_argv[0] = NOCATGETS("MAKEFLAGS");
/*
* Convert the MAKEFLAGS string value into a vector of char *,
* similar to argv.
*/
cp = cp_orig;
--- 1648,1658 ----
}
}
}
/* Allocate memory for the new MAKEFLAGS argv */
mf_argv = (char **) malloc((mf_argc + 1) * sizeof(char *));
! mf_argv[0] = (char *)NOCATGETS("MAKEFLAGS");
/*
* Convert the MAKEFLAGS string value into a vector of char *,
* similar to argv.
*/
cp = cp_orig;
*** 3018,3028 ****
* Append the DMake option and value to the MAKEFLAGS string.
*/
static void
append_makeflags_string(Name name, register String makeflags_string)
{
! char *option;
if (strcmp(name->string_mb, NOCATGETS("DMAKE_GROUP")) == 0) {
option = NOCATGETS(" -g ");
} else if (strcmp(name->string_mb, NOCATGETS("DMAKE_MAX_JOBS")) == 0) {
option = NOCATGETS(" -j ");
--- 3018,3028 ----
* Append the DMake option and value to the MAKEFLAGS string.
*/
static void
append_makeflags_string(Name name, register String makeflags_string)
{
! const char *option;
if (strcmp(name->string_mb, NOCATGETS("DMAKE_GROUP")) == 0) {
option = NOCATGETS(" -g ");
} else if (strcmp(name->string_mb, NOCATGETS("DMAKE_MAX_JOBS")) == 0) {
option = NOCATGETS(" -j ");