DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed dependencies for scripts (duplicates code again)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-03-29 22:46:24 +00:00
parent 33cf741d57
commit 1400331df3
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/makefile.c
View File

@ -1119,11 +1119,11 @@ static int _write_objects(Configure * configure, FILE * fp)
return ret; return ret;
} }
static int _script_depends(Config * config, FILE * fp, String const * target);
static int _target_script(Configure * configure, FILE * fp, static int _target_script(Configure * configure, FILE * fp,
String const * target) String const * target)
{ {
String const * script; String const * script;
String const * p;
if((script = config_get(configure->config, target, "script")) == NULL) if((script = config_get(configure->config, target, "script")) == NULL)
{ {
@ -1134,13 +1134,42 @@ static int _target_script(Configure * configure, FILE * fp,
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
return 0; return 0;
fprintf(fp, "\n%s:", target); fprintf(fp, "\n%s:", target);
if((p = config_get(configure->config, target, "depends")) != NULL) _script_depends(configure->config, fp, target);
fprintf(fp, " %s", p);
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "\t%s \"%s\"\n", script, target); fprintf(fp, "\t%s \"%s\"\n", script, target);
return 0; return 0;
} }
static int _script_depends(Config * config, FILE * fp, String const * target)
{
String const * p;
String * depends;
String * q;
size_t i;
char c;
/* XXX code duplication */
if((p = config_get(config, target, "depends")) == NULL)
return 0;
if((depends = string_new(p)) == NULL)
return 1;
q = depends;
for(i = 0;; i++)
{
if(depends[i] != ',' && depends[i] != '\0')
continue;
c = depends[i];
depends[i] = '\0';
fprintf(fp, " %s", depends);
if(c == '\0')
break;
depends += i + 1;
i = 0;
}
string_delete(q);
return 0;
}
static int _target_source(Configure * configure, FILE * fp, static int _target_source(Configure * configure, FILE * fp,
String const * target, String * source); String const * target, String * source);
static int _objects_target(Configure * configure, FILE * fp, static int _objects_target(Configure * configure, FILE * fp,
@ -1276,7 +1305,7 @@ static int _target_source(Configure * configure, FILE * fp,
return ret; return ret;
} }
static int _source_depends(Config * config, FILE * fp, String const * source) static int _source_depends(Config * config, FILE * fp, String const * target)
{ {
String const * p; String const * p;
String * depends; String * depends;
@ -1284,7 +1313,7 @@ static int _source_depends(Config * config, FILE * fp, String const * source)
size_t i; size_t i;
char c; char c;
if((p = config_get(config, source, "depends")) == NULL) if((p = config_get(config, target, "depends")) == NULL)
return 0; return 0;
if((depends = string_new(p)) == NULL) if((depends = string_new(p)) == NULL)
return 1; return 1;