- cmd = talloc_asprintf(ctx, "%s depends", build_info(ctx, dir));
- deps = lines_from_cmd(cmd, cmd);
- if (!deps)
- err(1, "Could not run '%s'", cmd);
+ deps = get_one_deps(ctx, dir, &num);
+ for (i = 0; i < num; i++) {
+ char **newdeps;
+ unsigned int j, newnum;
+
+ if (!strstarts(deps[i], "ccan/"))
+ continue;
+
+ newdeps = get_one_deps(ctx, deps[i], &newnum);
+
+ /* Should be short, so brute-force out dups. */
+ for (j = 0; j < newnum; j++) {
+ if (have_dep(deps, num, newdeps[j]))
+ continue;
+
+ deps = talloc_realloc(NULL, deps, char *, num + 2);
+ deps[num++] = newdeps[j];
+ deps[num] = NULL;
+ }
+ }