X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccan_depends.c;h=f81a42b861fae905c4cbba2c1816b6cde4bb23ba;hp=0511648e45db045f416c3a9cf0f12ba74783e768;hb=cbabfa8c8bd4757091c7fdb566b97388be890a74;hpb=9965fc25fcc92dc76d1cd4cf9595dc3dc9ebc586

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index 0511648e..f81a42b8 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 "str/str.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,32 @@ 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/"))
-			printf("%s\n", deps[i]);
+	if (deps)
+		for (i = 0; deps[i]; i++)
+			if (strstarts(deps[i], "ccan/") == ccan)
+				printf("%s\n", deps[i]);
 	return 0;
 }