X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Ftools.h;h=a7a25c99cd756e0c68dedc9da2247c7be0ad7371;hb=a1d06d55999cc5004f4a3c2c8c17638972c6fe50;hp=babd30c9370892c2f6961f3546bf493d94f1ec43;hpb=fb4c4c3ddc24772f71a64ec02d2c9ddaeb6e9f6b;p=ccan

diff --git a/tools/tools.h b/tools/tools.h
index babd30c9..a7a25c99 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -9,7 +9,9 @@
 #define SPACE_CHARS	" \f\n\r\t\v"
 
 /* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
-#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -I../.."
+#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror"
+
+#define COVERAGE_CFLAGS "-fprofile-arcs -ftest-coverage"
 
 /* This actually compiles and runs the info file to get dependencies. */
 char **get_deps(const void *ctx, const char *dir, bool recurse,
@@ -24,10 +26,15 @@ 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);
 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);
 
@@ -36,10 +43,13 @@ 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);
 /* 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,
 		     const char *outfile);
 /* Compile and link single C file, with object files, libs, etc.  NULL on
  * success, error output on fail. */