New asort routine; unf. breaks under -Wmissing-prototypes etc :(

[ccan] / tools / tools.h

diff --git a/tools/tools.h b/tools/tools.h
index 84b1fb8abe277a797517636593eafc601659b1a8..ed2f6bfb6e77442e9682f450d34db6b2cce6e93e 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -8,13 +8,40 @@
 
 #define SPACE_CHARS    " \f\n\r\t\v"
 
-#define CFLAGS "-O3 -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I."
+/* FIXME: Remove some -I */
+/* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
+#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -Iccan/ -I. -I.. -I../.."
 
-/* This actually compiles and runs the _info.c file to get dependencies. */
-char **get_deps(const void *ctx, const char *dir, bool recurse);
+/* This actually compiles and runs the info file to get dependencies. */
+char **get_deps(const void *ctx, const char *dir, const char *name,
+               bool recurse, char **infofile);
 
-/* This is safer: just looks for ccan/ strings in _info.c */
-char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse);
+/* This is safer: just looks for ccan/ strings in info */
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *name,
+                         bool recurse, char **infofile);
 
-#endif /* CCAN_TOOLS_H */
+/* This also needs to compile the info file. */
+char **get_libs(const void *ctx, const char *dir,
+               const char *name, unsigned int *num, char **infofile);
+
+/* From tools.c */
+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, const char *fmt, ...);
+char *temp_file(const void *ctx, const char *extension);
 
+/* From compile.c.
+ *
+ * These all compile into a temporary dir, and return the filename.
+ * On failure they return NULL, and errmsg is set to compiler output.
+ */
+/* 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, char **errmsg);
+/* Compile and link single C file, with object files, libs, etc. */
+char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
+                      const char *extra_cflags, const char *libs,
+                      char **errmsg);
+#endif /* CCAN_TOOLS_H */