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

More portable definition of AR

Browse Source
This commit is contained in:
Pierre Pronchery 2011-09-16 10:57:54 +00:00
parent 355491d530
commit db7638c97c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/makefile.c
View File

@ -619,7 +619,7 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
_targets_ldflags(configure, fp); _targets_ldflags(configure, fp);
} }
if((p = config_get(configure->config, "", "ar")) == NULL) if((p = config_get(configure->config, "", "ar")) == NULL)
p = "ar -rc"; p = "ar";
_makefile_output_variable(fp, "AR", p); _makefile_output_variable(fp, "AR", p);
if((p = config_get(configure->config, "", "ranlib")) == NULL) if((p = config_get(configure->config, "", "ranlib")) == NULL)
p = "ranlib"; p = "ranlib";
@ -1018,7 +1018,7 @@ static int _target_library(Configure * configure, FILE * fp,
if((p = config_get(configure->config, target, "depends")) != NULL) if((p = config_get(configure->config, target, "depends")) != NULL)
fprintf(fp, " %s", p); fprintf(fp, " %s", p);
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s%s%s%s", "\t$(AR) ", target, ".a $(", target, fprintf(fp, "%s%s%s%s%s", "\t$(AR) -rc ", target, ".a $(", target,
"_OBJS)"); "_OBJS)");
if((q = malloc(strlen(target) + 4)) != NULL) /* for ".so" later */ if((q = malloc(strlen(target) + 4)) != NULL) /* for ".so" later */
{ {
@ -1147,8 +1147,8 @@ static int _target_plugin(Configure * configure, FILE * fp,
if((p = config_get(configure->config, target, "depends")) != NULL) if((p = config_get(configure->config, target, "depends")) != NULL)
fprintf(fp, " %s", p); fprintf(fp, " %s", p);
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(", target, fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(",
"_OBJS) $(", target, "_LDFLAGS)"); target, "_OBJS) $(", target, "_LDFLAGS)");
if((q = malloc(strlen(target) + 4)) != NULL) if((q = malloc(strlen(target) + 4)) != NULL)
{ {
sprintf(q, "%s.so", target); sprintf(q, "%s.so", target);