rfc822: Update rfc822 module to use testdepends

[ccan] / tools / tools.h

diff --git a/tools/tools.h b/tools/tools.h
index 0a6ef8ccc4ac2b9a54fba7bfe9223bb48c4da068..1e9e22424906284458ea14f789c05ff3859916db 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -19,17 +19,25 @@
 
 #define COVERAGE_CFLAGS "-fprofile-arcs -ftest-coverage"
 
+/* This compiles up the _info file into a temporary. */
+char *compile_info(const void *ctx, const char *dir);
+
 /* This actually compiles and runs the info file to get dependencies. */
-char **get_deps(const void *ctx, const char *dir, bool recurse,
-               char **infofile);
+char **get_deps(const void *ctx, const char *dir, const char *style,
+               bool recurse,
+               char *(*get_info)(const void *ctx, const char *dir));
 
 /* This is safer: just looks for ccan/ strings in info */
-char **get_safe_ccan_deps(const void *ctx, const char *dir,
-                         bool recurse, char **infofile);
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
+                         bool recurse);
 
-/* This also needs to compile the info file. */
-char **get_libs(const void *ctx, const char *dir,
-               unsigned int *num, char **infofile);
+/* This also needs to compile the info file:
+ * style == NULL: don't recurse.
+ * style == depends: recurse dependencies.
+ * style == testdepends: recurse testdepends and depends.
+ */
+char **get_libs(const void *ctx, const char *dir, const char *style,
+               char *(*get_info)(const void *ctx, const char *dir));
 
 /* From tools.c */
 /* If set, print all commands run, all output they give and exit status. */
@@ -43,7 +51,7 @@ bool PRINTF_FMT(4,5) run_command(const void *ctx,
                                 const char *fmt, ...);
 char *run_with_timeout(const void *ctx, const char *cmd,
                       bool *ok, unsigned *timeout_ms);
-char *temp_dir(const void *ctx);
+const char *temp_dir(const void *ctx);
 bool move_file(const char *oldname, const char *newname);
 
 /* From compile.c.
@@ -54,7 +62,7 @@ bool move_file(const char *oldname, const char *newname);
 /* If set, say what we're compiling to. */
 extern bool compile_verbose;
 /* Compile multiple object files into a single. */
-char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+char *link_objects(const void *ctx, const char *basename,
                   const char *objs, char **errmsg);
 /* Compile a single C file to an object file.  Returns false if fails. */
 bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
@@ -67,9 +75,8 @@ bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
                      const char *compiler, const char *cflags,
                      const char *libs, const char *outfile, char **output);
 
-/* If in_pwd is false, return a file int temp_dir, otherwise a local file. */
-char *maybe_temp_file(const void *ctx, const char *extension, bool in_pwd,
-                     const char *srcname);
+/* Returns a file in temp_dir() */
+char *temp_file(const void *ctx, const char *extension, const char *srcname);
 
 /* Default wait for run_command.  Should never time out. */
 extern const unsigned int default_timeout_ms;
@@ -77,4 +84,6 @@ extern const unsigned int default_timeout_ms;
 /* Talloc destructor which unlinks file. */
 int unlink_file_destructor(char *filename);
 
+/* Get ccan/ top dir, given a directory within it. */
+const char *find_ccan_dir(const char *base);
 #endif /* CCAN_TOOLS_H */