X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=9bc7e1fcfda7e2f1148d0db40f545ecb3d5a362f;hp=fe3a3aedd3d03c1243c56e7d37809c12f376747b;hb=63bceea014e091a2f2907e49f7c3b33f042106f4;hpb=982539059656e4bbe6684e281140b3bb723deaa8

diff --git a/tools/tools.h b/tools/tools.h
index fe3a3aed..9bc7e1fc 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -26,6 +26,8 @@ char **get_libs(const void *ctx, const char *dir,
 		unsigned int *num, char **infofile);
 
 /* From tools.c */
+/* If set, print all commands run, all output they give and exit status. */
+extern bool tools_verbose;
 char *talloc_basename(const void *ctx, const char *dir);
 char *talloc_dirname(const void *ctx, const char *dir);
 char *talloc_getcwd(const void *ctx);
@@ -33,7 +35,6 @@ char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...);
 char *run_with_timeout(const void *ctx, const char *cmd,
 		       bool *ok, unsigned *timeout_ms);
 char *temp_dir(const void *ctx);
-char *temp_file(const void *ctx, const char *extension);
 bool move_file(const char *oldname, const char *newname);
 
 /* From compile.c.
@@ -41,8 +42,11 @@ bool move_file(const char *oldname, const char *newname);
  * These all compile into a temporary dir, and return the filename.
  * On failure they return NULL, and errmsg is set to compiler output.
  */
+/* 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 *objs, char **errmsg);
+char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+		   const char *objs, char **errmsg);
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
 char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
 		     const char *extra_cflags,
@@ -53,8 +57,8 @@ char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
 		       const char *objs, const char *extra_cflags,
 		       const char *libs, const char *outfile);
 
-/* If keep is false, return a temporary file.  Otherwise, base it on srcname */
-char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
+/* 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);
 
 /* Default wait for run_command.  Should never time out. */