X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fmodule_links.c;h=d665ba7d6672f7a86849f6683686e6bb83fa42a3;hb=453fdc02ce54ff965f9971a3bfd0e1a79b6c98f9;hp=66f8954f4be381d982e8068cf3917b653682e1c8;hpb=af5b1a18948345c5f9f9abf4eda3ab9fe0aa9a9f;p=ccan

diff --git a/tools/ccanlint/tests/module_links.c b/tools/ccanlint/tests/module_links.c
index 66f8954f..d665ba7d 100644
--- a/tools/ccanlint/tests/module_links.c
+++ b/tools/ccanlint/tests/module_links.c
@@ -23,13 +23,18 @@ static const char *can_build(struct manifest *m)
 
 static char *obj_list(const struct manifest *m)
 {
-	char *list = talloc_strdup(m, "");
+	char *list;
 	struct manifest *i;
 
+	if (m->compiled[COMPILE_NORMAL])
+		list = talloc_strdup(m, m->compiled[COMPILE_NORMAL]);
+	else
+		list = talloc_strdup(m, "");
+
 	/* Other CCAN deps. */
 	list_for_each(&m->deps, i, list) {
 		if (i->compiled[COMPILE_NORMAL])
-			list = talloc_asprintf_append(list, "%s ",
+			list = talloc_asprintf_append(list, " %s",
 						      i->compiled
 						      [COMPILE_NORMAL]);
 	}
@@ -38,12 +43,12 @@ static char *obj_list(const struct manifest *m)
 
 static char *lib_list(const struct manifest *m)
 {
-	unsigned int i, num;
-	char **libs = get_libs(m, ".",
-			       &num, &m->info_file->compiled[COMPILE_NORMAL]);
+	unsigned int i;
+	char **libs;
 	char *ret = talloc_strdup(m, "");
 
-	for (i = 0; i < num; i++)
+	libs = get_libs(m, m->dir, "depends", get_or_compile_info);
+	for (i = 0; libs[i]; i++)
 		ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
 	return ret;
 }