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

Completed the fix for object targets with filenames not matching the source

Browse Source
This commit is contained in:
Pierre Pronchery 2012-09-22 18:50:22 +00:00
parent aaa2776483
commit bb43891070
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/makefile.c
View File

@ -1383,8 +1383,12 @@ static int _target_source(Configure * configure, FILE * fp,
if(tt == TT_LIBTOOL) if(tt == TT_LIBTOOL)
fputs("$(LIBTOOL) --mode=compile ", fp); fputs("$(LIBTOOL) --mode=compile ", fp);
fprintf(fp, "%s%s%s", "$(AS) $(", target, "_ASFLAGS)"); fprintf(fp, "%s%s%s", "$(AS) $(", target, "_ASFLAGS)");
fprintf(fp, "%s%s%s%s%s%s", " -o ", source, ".o ", if(tt == TT_OBJECT)
source, ".", extension); fprintf(fp, "%s%s%s%s%s%s", " -o ", target, " ",
source, ".", extension);
else
fprintf(fp, "%s%s%s%s%s%s", " -o ", source,
".o ", source, ".", extension);
fputc('\n', fp); fputc('\n', fp);
break; break;
case OT_C_SOURCE: case OT_C_SOURCE:
@ -1418,7 +1422,13 @@ static int _target_source(Configure * configure, FILE * fp,
fputs(" -D _GNU_SOURCE", fp); fputs(" -D _GNU_SOURCE", fp);
} }
if(string_find(source, "/")) if(string_find(source, "/"))
fprintf(fp, "%s%s%s", " -o ", source, ".o"); {
if(tt == TT_OBJECT)
fprintf(fp, "%s%s", " -o ", target);
else
fprintf(fp, "%s%s%s", " -o ", source,
".o");
}
fprintf(fp, "%s%s%s%s", " -c ", source, ".", extension); fprintf(fp, "%s%s%s%s", " -c ", source, ".", extension);
fputc('\n', fp); fputc('\n', fp);
break; break;
@ -1439,7 +1449,13 @@ static int _target_source(Configure * configure, FILE * fp,
if(p != NULL) if(p != NULL)
fprintf(fp, " %s", p); fprintf(fp, " %s", p);
if(string_find(source, "/")) if(string_find(source, "/"))
fprintf(fp, "%s%s%s", " -o ", source, ".o"); {
if(tt == TT_OBJECT)
fprintf(fp, "%s%s", " -o ", target);
else
fprintf(fp, "%s%s%s", " -o ", source,
".o");
}
fprintf(fp, "%s%s%s%s", " -c ", source, ".", extension); fprintf(fp, "%s%s%s%s", " -c ", source, ".", extension);
fputc('\n', fp); fputc('\n', fp);
break; break;