/* FIXME: This doesn't uniquify. */
for (i = 0; i < talloc_array_length(deps); i++) {
- libs = get_libs(ctx, deps[i]->dir, false, get_or_compile_info);
+ libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info);
for (j = 0; libs[j]; j++)
list = talloc_asprintf_append(list, "-l%s ", libs[j]);
}
char **libs;
char *ret = talloc_strdup(m, "");
- libs = get_libs(m, m->dir, true, get_or_compile_info);
+ 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;
char **libs;
char *ret = talloc_strdup(m, "");
- libs = get_libs(m, m->dir, true, get_or_compile_info);
+ 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;
return lines;
}
-char **get_libs(const void *ctx, const char *dir, bool recurse,
+/* O(n^2) but n is small. */
+static char **add_deps(char **deps1, char **deps2)
+{
+ unsigned int i, len;
+
+ len = talloc_array_length(deps1);
+
+ for (i = 0; deps2[i]; i++) {
+ if (have_dep(deps1, deps2[i]))
+ continue;
+ deps1 = talloc_realloc(NULL, deps1, char *, len + 1);
+ deps1[len-1] = talloc_steal(deps1, deps2[i]);
+ deps1[len++] = NULL;
+ }
+ return deps1;
+}
+
+char **get_libs(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir))
{
char **deps, **libs;
libs = get_one_libs(ctx, dir, get_info);
len = talloc_array_length(libs);
- if (recurse) {
- deps = get_deps(ctx, dir, "depends", true, get_info);
+ if (style) {
+ deps = get_deps(ctx, dir, style, true, get_info);
+ if (streq(style, "testdepends"))
+ deps = add_deps(deps,
+ get_deps(ctx, dir, "depends", true,
+ get_info));
+
for (i = 0; deps[i]; i++) {
char **newlibs, *subdir;
size_t newlen;
char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
bool recurse);
-/* This also needs to compile the info file. */
-char **get_libs(const void *ctx, const char *dir, bool recurse,
+/* This also needs to compile the info file:
+ * style == NULL: don't recurse.
+ * style == depends: recurse dependencies.
+ * style == testdepends: recurse testdepends and depends.
+ */
+char **get_libs(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir));
/* From tools.c */