X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccan_depends.c;h=a487e09be712588122142c6d9274ff4b9397e4bd;hp=ca8c4a610967402a9a8047e7e2b73172eabc81ad;hb=bdb8d75154d7aefe01788e5dd5adb11e3c943c11;hpb=023f704e8089f64bd7a77bb7f95b8ea5355fe640

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index ca8c4a61..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 "string/string.h"
-#include "talloc/talloc.h"
+#include <ccan/err/err.h>
+#include <ccan/str/str.h>
 
 int main(int argc, char *argv[])
 {
@@ -11,6 +10,8 @@ int main(int argc, char *argv[])
 	unsigned int i;
 	bool compile = false;
 	bool recurse = true;
+	bool ccan = true;
+	const char *style = "depends";
 
 	if (argv[1] && streq(argv[1], "--direct")) {
 		argv++;
@@ -22,18 +23,31 @@ int main(int argc, char *argv[])
 		argc--;
 		compile = true;
 	}
+	if (argv[1] && streq(argv[1], "--non-ccan")) {
+		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] <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");
+
 	if (compile)
-		deps = get_deps(talloc_autofree_context(), argv[1], recurse);
+		deps = get_deps(NULL, argv[1], style, recurse, compile_info);
 	else
-		deps = get_safe_ccan_deps(talloc_autofree_context(), argv[1],
-					  recurse);
+		deps = get_safe_ccan_deps(NULL, argv[1], style, 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;
 }