tools: don't assume modules are immediately below ccan/ dir.

[ccan] / tools / ccan_depends.c

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index b055e44eb1f53e1aee4c5e6f42731c195ce66555..bfaa5c4e1c9bef5e19867f0ab783215b53360d8b 100644 (file)
--- a/tools/ccan_depends.c
+++ b/tools/ccan_depends.c
@@ -1,7 +1,7 @@
 #include "tools.h"
-#include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <ccan/err/err.h>
 #include <ccan/str/str.h>
 #include <ccan/talloc/talloc.h>
 
@@ -12,6 +12,7 @@ int main(int argc, char *argv[])
        bool compile = false;
        bool recurse = true;
        bool ccan = true;
+       const char *style = "depends";
 
        if (argv[1] && streq(argv[1], "--direct")) {
                argv++;
@@ -28,8 +29,13 @@ int main(int argc, char *argv[])
                argc--;
                ccan = false;
        }
+       if (argv[1] && streq(argv[1], "--tests")) {
+               argv++;
+               argc--;
+               style = "testdepends";
+       }
        if (argc != 2)
-               errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] <dir>\n"
+               errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] [--tests] <dir>\n"
                        "Spits out all the ccan dependencies (recursively unless --direct)");
 
        /* We find depends without compiling by looking for ccan/ */
@@ -38,10 +44,10 @@ int main(int argc, char *argv[])
 
        if (compile)
                deps = get_deps(talloc_autofree_context(), argv[1],
-                               recurse, NULL);
+                               style, recurse, compile_info);
        else
                deps = get_safe_ccan_deps(talloc_autofree_context(),
-                                         argv[1], recurse, NULL);
+                                         argv[1], style, recurse);
 
        for (i = 0; deps[i]; i++)
                if (strstarts(deps[i], "ccan/") == ccan)