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.63 and 1.64

version 1.63, 2007/09/16 10:14:26

version 1.64, 2007/09/16 12:30:35

Line 756

* Side Effects:

* The searchPath field of all the suffixes is extended by the

* directories in dirSearchPath. If paths were specified for the

* directories in defaultPath. If paths were specified for the

* ".h" suffix, the directories are stuffed into a global variable

* called ".INCLUDES" with each directory preceded by a -I. The same

* is done for the ".a" suffix, except the variable is called

Line 784

if (s->flags & SUFF_LIBRARY) {

Dir_Concat(&inLibs, &s->searchPath);

}

Dir_Concat(&s->searchPath, dirSearchPath);

Dir_Concat(&s->searchPath, defaultPath);

} else

Lst_Clone(&s->searchPath, dirSearchPath, Dir_CopyDir);

Lst_Clone(&s->searchPath, defaultPath, Dir_CopyDir);

}

Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", &inIncludes));

Line 1256

path = &s->searchPath;

} else

/* Use default search path. */

path = dirSearchPath;

path = defaultPath;

/* Expand the word along the chosen path. */

Lst_Init(&exp);

Line 1679

(Lst_IsEmpty(&gn->children) && Lst_IsEmpty(&gn->commands)))

{

gn->path = Dir_FindFile(gn->name,

(targ == NULL ? dirSearchPath :

(targ == NULL ? defaultPath :

&targ->suff->searchPath));

if (gn->path != NULL) {

char *ptr;

Line 1965

suffNull->name = estrdup("");

suffNull->nameLen = 0;

Lst_Init(&suffNull->searchPath);

Dir_Concat(&suffNull->searchPath, dirSearchPath);

Dir_Concat(&suffNull->searchPath, defaultPath);

Lst_Init(&suffNull->children);

Lst_Init(&suffNull->parents);

Lst_Init(&suffNull->ref);