src/usr.bin/make/suff.c - diff

Return to suff.c CVS log

Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/suff.c between version 1.75 and 1.76

version 1.75, 2007/11/06 21:15:19

version 1.76, 2007/11/17 16:39:45

Line 1391

}

/* Copy variables from member node to this one. */

Varq_Set(TARGET_INDEX, Varq_Value(TARGET_INDEX, mem), gn);

Var(TARGET_INDEX, gn) = Var(TARGET_INDEX, mem);

Varq_Set(PREFIX_INDEX, Varq_Value(PREFIX_INDEX, mem), gn);

Var(PREFIX_INDEX, gn) = Var(PREFIX_INDEX, mem);

ms = mem->suffix;

if (ms == NULL) {

Line 1405

/* Set the other two local variables required for this target. */

Varq_Set(MEMBER_INDEX, mem->name, gn);

Var(MEMBER_INDEX, gn) = mem->name;

Varq_Set(ARCHIVE_INDEX, gn->name, gn);

Var(ARCHIVE_INDEX, gn) = gn->name;

if (ms != NULL) {

Line 1601

* since it's only set to the path if the thing is only a source and

* if it's only a source, it doesn't matter what we put here as far

* as expanding sources is concerned, since it has none... */

Varq_Set(TARGET_INDEX, gn->name, gn);

Var(TARGET_INDEX, gn) = gn->name;

pref = targ != NULL ? targ->pref : gn->name;

pref = targ != NULL ? estrdup(targ->pref) : gn->name;

Varq_Set(PREFIX_INDEX, pref, gn);

Var(PREFIX_INDEX, gn) = pref;

/* Now we've got the important local variables set, expand any sources

* that still contain variables or wildcards in their names. */

Line 1629

&targ->suff->searchPath));

if (gn->path != NULL) {

char *ptr;

Varq_Set(TARGET_INDEX, gn->path, gn);

Var(TARGET_INDEX, gn) = estrdup(gn->path);

if (targ != NULL) {

/* Suffix known for the thing -- trim

Line 1650

else

ptr = gn->path;

Varq_Set(PREFIX_INDEX, ptr, gn);

Var(PREFIX_INDEX, gn) = estrdup(ptr);

gn->path[savep] = savec;

} else {

Line 1664

else

ptr = gn->path;

Varq_Set(PREFIX_INDEX, ptr, gn);

Var(PREFIX_INDEX, gn) = estrdup(ptr);

}

} else {

Line 1740

* is set the standard and System V variables. */

targ->node->type |= OP_DEPS_FOUND;

Varq_Set(PREFIX_INDEX, targ->pref, targ->node);

Var(PREFIX_INDEX, targ->node) = estrdup(targ->pref);

Varq_Set(TARGET_INDEX, targ->node->name, targ->node);

Var(TARGET_INDEX, targ->node) = targ->node->name;

}

Line 1834

Arch_FindLib(gn, &s->searchPath);

} else {

gn->suffix = NULL;

Varq_Set(TARGET_INDEX, gn->name, gn);

Var(TARGET_INDEX, gn) = gn->name;

}

* Because a library (-lfoo) target doesn't follow the standard

* filesystem conventions, we don't set the regular variables

* for the thing. .PREFIX is simply made empty...

Varq_Set(PREFIX_INDEX, "", gn);

Var(PREFIX_INDEX, gn) = "";

} else

SuffFindNormalDeps(gn, slst);

}