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

Completing initial support for soname

Browse Source
This commit is contained in:
Pierre Pronchery 2009-06-16 23:12:35 +00:00
parent 2c64824a2c
commit 7b5ed85f99
1 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/makefile.c
View File

@ -282,6 +282,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
{ {
fputs("MKDIR\t= mkdir -p\n", fp); fputs("MKDIR\t= mkdir -p\n", fp);
fputs("INSTALL\t= install\n", fp); fputs("INSTALL\t= install\n", fp);
fputs("LN\t= ln -f\n", fp);
} }
return 0; return 0;
} }
@ -1409,7 +1410,7 @@ static int _install_targets(Configure * configure, FILE * fp)
static void _install_target_binary(Config * config, FILE * fp, static void _install_target_binary(Config * config, FILE * fp,
String const * target); String const * target);
static void _install_target_library(Config * config, FILE * fp, static int _install_target_library(Config * config, FILE * fp,
String const * target); String const * target);
static void _install_target_libtool(Config * config, FILE * fp, static void _install_target_libtool(Config * config, FILE * fp,
String const * target); String const * target);
@ -1417,6 +1418,7 @@ static void _install_target_object(Config * config, FILE * fp,
String const * target); String const * target);
static int _install_target(Config * config, FILE * fp, String const * target) static int _install_target(Config * config, FILE * fp, String const * target)
{ {
int ret = 0;
String const * type; String const * type;
TargetType tt; TargetType tt;
@ -1428,7 +1430,7 @@ static int _install_target(Config * config, FILE * fp, String const * target)
_install_target_binary(config, fp, target); _install_target_binary(config, fp, target);
break; break;
case TT_LIBRARY: case TT_LIBRARY:
_install_target_library(config, fp, target); ret = _install_target_library(config, fp, target);
break; break;
case TT_LIBTOOL: case TT_LIBTOOL:
_install_target_libtool(config, fp, target); _install_target_libtool(config, fp, target);
@ -1439,7 +1441,7 @@ static int _install_target(Config * config, FILE * fp, String const * target)
case TT_UNKNOWN: case TT_UNKNOWN:
break; break;
} }
return 0; return ret;
} }
static void _install_target_binary(Config * config, FILE * fp, static void _install_target_binary(Config * config, FILE * fp,
@ -1454,18 +1456,32 @@ static void _install_target_binary(Config * config, FILE * fp,
" $(DESTDIR)", path, target); " $(DESTDIR)", path, target);
} }
static void _install_target_library(Config * config, FILE * fp, static int _install_target_library(Config * config, FILE * fp,
String const * target) String const * target)
{ {
String const * path; String const * path;
String const * p;
String * soname;
if((path = config_get(config, target, "install")) == NULL) if((path = config_get(config, target, "install")) == NULL)
return; return 0;
fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path);
fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0644 ", target, fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0644 ", target,
".a $(DESTDIR)", path, target, ".a\n"); ".a $(DESTDIR)", path, target, ".a\n");
if((p = config_get(config, target, "soname")) != NULL)
soname = string_new(p);
else
soname = string_new_append(target, ".so.0", NULL);
if(soname == NULL)
return 1;
fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 ", target, fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 ", target,
".so $(DESTDIR)", path, target, ".so\n"); ".so $(DESTDIR)", path, soname, ".0\n");
fprintf(fp, "%s%s%s%s/%s%s", "\t$(LN) -s ", soname,
".0 $(DESTDIR)", path, soname, "\n");
fprintf(fp, "%s%s%s%s/%s%s", "\t$(LN) -s ", soname,
".0 $(DESTDIR)", path, target, ".so\n");
string_delete(soname);
return 0;
} }
static void _install_target_libtool(Config * config, FILE * fp, static void _install_target_libtool(Config * config, FILE * fp,
@ -1599,6 +1615,8 @@ static int _write_uninstall(Configure * configure, FILE * fp)
return ret; return ret;
} }
static void _uninstall_target_library(Config * config, FILE * fp,
String const * target, String const * path);
static int _uninstall_target(Config * config, FILE * fp, String const * target) static int _uninstall_target(Config * config, FILE * fp, String const * target)
{ {
String const * type; String const * type;
@ -1617,10 +1635,7 @@ static int _uninstall_target(Config * config, FILE * fp, String const * target)
fprintf(fp, "\t%s%s/%s\n", rm_destdir, path, target); fprintf(fp, "\t%s%s/%s\n", rm_destdir, path, target);
break; break;
case TT_LIBRARY: case TT_LIBRARY:
fprintf(fp, "\t%s%s/%s%s", rm_destdir, path, target, _uninstall_target_library(config, fp, target, path);
".a\n");
fprintf(fp, "\t%s%s/%s%s", rm_destdir, path, target,
".so\n");
break; break;
case TT_LIBTOOL: case TT_LIBTOOL:
fprintf(fp, "\t%s%s%s/%s%s", "$(LIBTOOL)" fprintf(fp, "\t%s%s%s/%s%s", "$(LIBTOOL)"
@ -1636,6 +1651,27 @@ static int _uninstall_target(Config * config, FILE * fp, String const * target)
return 0; return 0;
} }
static void _uninstall_target_library(Config * config, FILE * fp,
String const * target, String const * path)
{
String const * soname;
const String * format = "\t%s%s/%s%s";
const String * rm_destdir = "$(RM) $(DESTDIR)";
fprintf(fp, format, rm_destdir, path, target, ".a\n");
if((soname = config_get(config, target, "soname")) == NULL)
{
fprintf(fp, format, rm_destdir, path, target, ".so.0.0\n");
fprintf(fp, format, rm_destdir, path, target, ".so.0\n");
}
else
{
fprintf(fp, format, rm_destdir, path, soname, ".0\n");
fprintf(fp, format, rm_destdir, path, soname, "\n");
}
fprintf(fp, format, rm_destdir, path, target, ".so\n");
}
static int _uninstall_include(Config * config, FILE * fp, static int _uninstall_include(Config * config, FILE * fp,
String const * include) String const * include)
{ {