X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccan_depends.c;h=a487e09be712588122142c6d9274ff4b9397e4bd;hp=42efd9558600b96b205a40de15301ebe458f313f;hb=77354575335e5ee900a4ba126d4d76e34b9273e8;hpb=5b7e9d904afa72961340c225de39daab29ff7d0e

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index 42efd955..a487e09b 100644
--- a/tools/ccan_depends.c
+++ b/tools/ccan_depends.c
@@ -1,9 +1,8 @@
 #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>
 
 int main(int argc, char *argv[])
 {
@@ -12,7 +11,7 @@ int main(int argc, char *argv[])
 	bool compile = false;
 	bool recurse = true;
 	bool ccan = true;
-	char *dirname, *basename;
+	const char *style = "depends";
 
 	if (argv[1] && streq(argv[1], "--direct")) {
 		argv++;
@@ -29,23 +28,23 @@ 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/ */
 	if (!ccan && !compile)
 		errx(1, "--non-ccan needs --compile");
 
-	dirname = talloc_dirname(NULL, argv[1]);
-	basename = talloc_basename(NULL, argv[1]);
-
 	if (compile)
-		deps = get_deps(talloc_autofree_context(),
-				dirname, basename, recurse, NULL);
+		deps = get_deps(NULL, argv[1], style, recurse, compile_info);
 	else
-		deps = get_safe_ccan_deps(talloc_autofree_context(),
-					  dirname, basename, recurse, NULL);
+		deps = get_safe_ccan_deps(NULL, argv[1], style, recurse);
 
 	for (i = 0; deps[i]; i++)
 		if (strstarts(deps[i], "ccan/") == ccan)