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

Also analyze arguments to "gcc -l" for program-specific flags

Browse Source
This commit is contained in:
Pierre Pronchery 2009-11-01 16:37:17 +00:00
parent 90c0ca76c3
commit 0b0bec980e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/makefile.c
View File

@ -479,12 +479,12 @@ static void _targets_ldflags(Configure * configure, FILE * fp)
if((p = config_get(configure->config, "", "ldflags_force")) != NULL) if((p = config_get(configure->config, "", "ldflags_force")) != NULL)
{ {
fprintf(fp, "%s", "LDFLAGSF= "); fputs("LDFLAGSF=", fp);
_binary_ldflags(configure, fp, p); _binary_ldflags(configure, fp, p);
} }
if((p = config_get(configure->config, "", "ldflags")) != NULL) if((p = config_get(configure->config, "", "ldflags")) != NULL)
{ {
fprintf(fp, "%s", "LDFLAGS\t= "); fputs("LDFLAGS\t=", fp);
_binary_ldflags(configure, fp, p); _binary_ldflags(configure, fp, p);
} }
} }
@ -493,7 +493,7 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
String const * ldflags) String const * ldflags)
{ {
char const * libs_gnu[] = { "socket", NULL }; char const * libs_gnu[] = { "socket", NULL };
char const * libs_bsd[] = { "crypt", "dl", "socket", NULL }; char const * libs_bsd[] = { "dl", "socket", NULL };
char const * libs_sunos[] = { "dl", NULL }; char const * libs_sunos[] = { "dl", NULL };
char buf[10]; char buf[10];
char const ** libs; char const ** libs;
@ -501,9 +501,9 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
String * q; String * q;
size_t i; size_t i;
if((p = string_new(ldflags)) == NULL) if((p = string_new(ldflags)) == NULL) /* XXX report error? */
{ {
fprintf(fp, "%s%s", ldflags, "\n"); fprintf(fp, " %s%s", ldflags, "\n");
return; return;
} }
switch(configure->os) switch(configure->os)
@ -535,7 +535,7 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
continue; continue;
memmove(q, q + strlen(buf), strlen(q) - strlen(buf) + 1); memmove(q, q + strlen(buf), strlen(q) - strlen(buf) + 1);
} }
fprintf(fp, "%s\n", p); fprintf(fp, " %s\n", p);
string_delete(p); string_delete(p);
} }
@ -896,7 +896,7 @@ static void _flags_c(Configure * configure, FILE * fp, String const * target)
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s", target, "_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)"); fprintf(fp, "%s%s", target, "_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)");
if((p = config_get(configure->config, target, "ldflags")) != NULL) if((p = config_get(configure->config, target, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
fputc('\n', fp); fputc('\n', fp);
} }
@ -911,7 +911,7 @@ static void _flags_cxx(Configure * configure, FILE * fp, String const * target)
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s", target, "_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)"); fprintf(fp, "%s%s", target, "_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)");
if((p = config_get(configure->config, target, "ldflags")) != NULL) if((p = config_get(configure->config, target, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
fputc('\n', fp); fputc('\n', fp);
} }
@ -936,7 +936,7 @@ static int _target_library(Configure * configure, FILE * fp,
{ {
sprintf(q, "%s.a", target); sprintf(q, "%s.a", target);
if((p = config_get(configure->config, q, "ldflags")) != NULL) if((p = config_get(configure->config, q, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
} }
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s%s", "\t$(RANLIB) ", target, ".a\n"); fprintf(fp, "%s%s%s", "\t$(RANLIB) ", target, ".a\n");
@ -951,12 +951,12 @@ static int _target_library(Configure * configure, FILE * fp,
fprintf(fp, "%s%s", " -Wl,-soname,", p); fprintf(fp, "%s%s", " -Wl,-soname,", p);
fprintf(fp, "%s%s%s", " $(", target, "_OBJS)"); fprintf(fp, "%s%s%s", " $(", target, "_OBJS)");
if((p = config_get(configure->config, target, "ldflags")) != NULL) if((p = config_get(configure->config, target, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
if(q != NULL) if(q != NULL)
{ {
sprintf(q, "%s.so", target); sprintf(q, "%s.so", target);
if((p = config_get(configure->config, q, "ldflags")) != NULL) if((p = config_get(configure->config, q, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
free(q); free(q);
} }
fputc('\n', fp); fputc('\n', fp);
@ -977,7 +977,7 @@ static int _target_libtool(Configure * configure, FILE * fp,
fprintf(fp, "%s%s%s%s%s", "\t$(LIBTOOL) --mode=link $(CC) -o ", target, fprintf(fp, "%s%s%s%s%s", "\t$(LIBTOOL) --mode=link $(CC) -o ", target,
".la $(", target, "_OBJS)"); ".la $(", target, "_OBJS)");
if((p = config_get(configure->config, target, "ldflags")) != NULL) if((p = config_get(configure->config, target, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
fprintf(fp, "%s%s%s", " -rpath $(LIBDIR) $(", target, "_LDFLAGS)\n"); fprintf(fp, "%s%s%s", " -rpath $(LIBDIR) $(", target, "_LDFLAGS)\n");
return 0; return 0;
} }
@ -1062,12 +1062,12 @@ static int _target_plugin(Configure * configure, FILE * fp,
fprintf(fp, "%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(", target, fprintf(fp, "%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(", target,
"_OBJS)"); "_OBJS)");
if((p = config_get(configure->config, target, "ldflags")) != NULL) if((p = config_get(configure->config, target, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
if((q = malloc(strlen(target) + 4)) != NULL) if((q = malloc(strlen(target) + 4)) != NULL)
{ {
sprintf(q, "%s.so", target); sprintf(q, "%s.so", target);
if((p = config_get(configure->config, q, "ldflags")) != NULL) if((p = config_get(configure->config, q, "ldflags")) != NULL)
fprintf(fp, " %s", p); _binary_ldflags(configure, fp, p);
free(q); free(q);
} }
fputc('\n', fp); fputc('\n', fp);