Removed `-lgtop_sysdeps'. This is gmodule loaded from the backend open

2000-01-22  Martin Baulig  <martin@home-of-linux.org>

	* configure.in (LIBGTOP_LIBS): Removed `-lgtop_sysdeps'. This
	is gmodule loaded from the backend open function.

	* lib/init.c (glibtop_init_s): Don't call glibtop_open_s () here.

	* init-backend.c: Added support for a "ExtraLibs" section in the
	backend description file.
This commit is contained in:
Martin Baulig
2000-01-22 22:14:59 +00:00
committed by Martin Baulig
parent d567c86818
commit e8c90833e8
5 changed files with 84 additions and 5 deletions

View File

@@ -79,6 +79,32 @@ _get_library_filename (xmlDocPtr doc, xmlNodePtr cur, const char *directory)
return retval;
}
static GSList *
_parse_extra_libs (xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, const char *dir)
{
GSList *list = NULL;
/* We don't care what the top level element name is */
cur = cur->childs;
while (cur != NULL) {
if ((!strcmp (cur->name, "ExtraLib")) && (cur->ns == ns)) {
xmlNodePtr sub = cur->childs;
while (sub != NULL) {
if ((!strcmp (sub->name, "ShlibName")) && (sub->ns == ns))
list = g_slist_append
(list, _get_library_filename (doc, sub, dir));
sub = sub->next;
}
}
cur = cur->next;
}
return list;
}
static glibtop_backend_entry *
_parseBackend (xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, const char *dir)
{
@@ -105,6 +131,9 @@ _parseBackend (xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, const char *dir)
if ((!strcmp (sub->name, "ShlibName")) && (sub->ns == ns))
ret->shlib_name = _get_library_filename (doc, sub, dir);
if ((!strcmp (sub->name, "ExtraLibs")) && (sub->ns == ns))
ret->extra_libs = _parse_extra_libs (doc, ns, sub, dir);
sub = sub->next;
}
}