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

Nicer dist rule output

Browse Source
This commit is contained in:
Pierre Pronchery 2006-03-19 04:23:04 +00:00
parent fd851865fa
commit eb5d1a753b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/makefile.c
View File

@ -30,7 +30,7 @@ int makefile(Configure * configure, Config * config, String * directory,
if(configure->prefs & PREFS_v) if(configure->prefs & PREFS_v)
printf("%s%s%s%s%s", "Creating ", MAKEFILE, " in ", printf("%s%s%s%s%s", "Creating ", MAKEFILE, " in ",
directory, "\n"); directory, "\n");
ret += _makefile_write(configure, config, fp, ca, from, to); ret |= _makefile_write(configure, config, fp, ca, from, to);
if(fp != NULL) if(fp != NULL)
fclose(fp); fclose(fp);
} }
@ -706,11 +706,18 @@ static int _write_dist(Prefs * prefs, Config * config, FILE * fp,
"\t$(RM) $(PACKAGE)-$(VERSION)\n" "\t$(RM) $(PACKAGE)-$(VERSION)\n"
"\t$(LN) . $(PACKAGE)-$(VERSION)\n" "\t$(LN) . $(PACKAGE)-$(VERSION)\n"
"\t@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \\\n"); "\t@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \\\n");
for(i = to; i > from; i--) for(i = from+1; i < to; i++)
{ {
array_get_copy(ca, i - 1, &p); array_get_copy(ca, i, &p);
_dist_subdir(config, fp, p); _dist_subdir(config, fp, p);
} }
if(from < to)
{
array_get_copy(ca, from, &p);
_dist_subdir(config, fp, p);
}
else
return 1;
fprintf(fp, "%s", "\t$(RM) $(PACKAGE)-$(VERSION)\n"); fprintf(fp, "%s", "\t$(RM) $(PACKAGE)-$(VERSION)\n");
return 0; return 0;
} }
@ -732,7 +739,6 @@ static int _dist_subdir(Config * config, FILE * fp, Config * subdir)
if(path[0] == '/') if(path[0] == '/')
path++; path++;
if((targets = config_get(subdir, "", "targets")) != NULL) if((targets = config_get(subdir, "", "targets")) != NULL)
{
/* FIXME unique SOURCES */ /* FIXME unique SOURCES */
for(i = 0;; i++) for(i = 0;; i++)
{ {
@ -749,7 +755,6 @@ static int _dist_subdir(Config * config, FILE * fp, Config * subdir)
targets+=i+1; targets+=i+1;
i = 0; i = 0;
} }
}
if((dist = config_get(subdir, "", "dist")) != NULL) if((dist = config_get(subdir, "", "dist")) != NULL)
_dist_subdir_dist(fp, path, dist); _dist_subdir_dist(fp, path, dist);
fprintf(fp, "%s%s%s%s", "\t\t$(PACKAGE)-$(VERSION)/", path, fprintf(fp, "%s%s%s%s", "\t\t$(PACKAGE)-$(VERSION)/", path,