ccanize tdb further, and add simple test.

[ccan] / tools / ccan_depends.c

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index 0511648e45db045f416c3a9cf0f12ba74783e768..0c46173f06a7987a72e6f5b376d2e96d7269b89e 100644 (file)
--- a/tools/ccan_depends.c
+++ b/tools/ccan_depends.c
@@ -2,8 +2,8 @@
 #include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "str/str.h"
-#include "talloc/talloc.h"
+#include <ccan/str/str.h>
+#include <ccan/talloc/talloc.h>
 
 int main(int argc, char *argv[])
 {
@@ -11,6 +11,7 @@ int main(int argc, char *argv[])
        unsigned int i;
        bool compile = false;
        bool recurse = true;
+       bool ccan = true;
 
        if (argv[1] && streq(argv[1], "--direct")) {
                argv++;
@@ -22,10 +23,19 @@ int main(int argc, char *argv[])
                argc--;
                compile = true;
        }
+       if (argv[1] && streq(argv[1], "--non-ccan")) {
+               argv++;
+               argc--;
+               ccan = false;
+       }
        if (argc != 2)
-               errx(1, "Usage: ccan_depends [--direct] [--compile] <dir>\n"
+               errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] <dir>\n"
                        "Spits out all the ccan dependencies (recursively unless --direct)");
 
+       /* We find depends without compiling by looking for ccan/ */
+       if (!ccan && !compile)
+               errx(1, "--non-ccan needs --compile");
+
        if (compile)
                deps = get_deps(talloc_autofree_context(), argv[1], recurse);
        else
@@ -33,7 +43,7 @@ int main(int argc, char *argv[])
                                          recurse);
 
        for (i = 0; deps[i]; i++)
-               if (strstarts(deps[i], "ccan/"))
+               if (strstarts(deps[i], "ccan/") == ccan)
                        printf("%s\n", deps[i]);
        return 0;
 }