d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make -V expand it's arguments. This means that instead of 'make -V OBJS'

Browse Source 
printing something useless (to a shell) like: ${SRCS:N*.h:R:S/$/.o/g}
it will instead print the actual ${OBJS} value.
This commit is contained in:
peter 1998-06-13 11:55:57 +00:00
parent 885f9e9d51
commit 1f5c254c67
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/make/main.c
View File

@ -47,7 +47,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#endif
static const char rcsid[] =
"$Id: main.c,v 1.22 1997/08/27 06:31:27 jkh Exp $";
"$Id: main.c,v 1.23 1997/09/29 03:53:51 imp Exp $";
#endif /* not lint */
/*-
@ -163,6 +163,7 @@ MainParseArgs(argc, argv)
{
extern int optind;
extern char *optarg;
char *p;
int c;
optind = 1; /* since we're called more than once */
@ -185,7 +186,10 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
break;
case 'V':
printVars = TRUE;
(void)Lst_AtEnd(variables, (ClientData)optarg);
(void)asprintf(&p, "${%s}", optarg);
if (!p)
Punt("make: cannot allocate memory.");
(void)Lst_AtEnd(variables, (ClientData)p);
Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
break;
@ -746,12 +750,10 @@ main(argc, argv)
for (ln = Lst_First(variables); ln != NILLNODE;
ln = Lst_Succ(ln)) {
char *value = Var_Value((char *)Lst_Datum(ln),
VAR_GLOBAL, &p1);
char *value = Var_Subst(NULL, (char *)Lst_Datum(ln),
VAR_GLOBAL, FALSE);
printf("%s\n", value ? value : "");
if (p1)
free(p1);
}
}