#define SPACE_CHARS " \f\n\r\t\v"
-/* FIXME: Remove some -I */
-#define CFLAGS "-O -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I.. -I../.."
+/* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
+#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -I../.."
/* 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);
+char **get_deps(const void *ctx, const char *dir, bool recurse,
+ char **infofile);
/* This is safer: just looks for ccan/ strings in info */
-char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *name,
+char **get_safe_ccan_deps(const void *ctx, const char *dir,
bool recurse, char **infofile);
/* 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);
+ unsigned int *num, char **infofile);
/* From tools.c */
char *talloc_basename(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. */
-/* Compile multiple object files into a single. Returns errmsg if fails. */
-char *link_objects(const void *ctx, const char *outfile, const char *objs);
+bool move_file(const char *oldname, const char *newname);
+
+/* 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 *outfile, const char *cfile);
-/* Compile and link single C file, with object files.
- * Returns name of result, or NULL (and fills in errmsg). */
-char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
- const char *extra_cflags, const char *libs,
- char **errmsg);
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+ 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 *ccandir,
+ const char *objs, const char *extra_cflags,
+ const char *libs, char **errmsg);
#endif /* CCAN_TOOLS_H */