X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=2092042f7be6fc4606055965a35248b0c9950ef3;hp=cc004036ded41db878b01639e85a5ae1d6143686;hb=747a69435d9f83c0968d9689c4951bc0233ffc5e;hpb=f3948bf8102ce5281460e6ed6053150a96d71a91

diff --git a/tools/tools.h b/tools/tools.h
index cc004036..2092042f 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -8,20 +8,20 @@
 
 #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.. -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);
@@ -38,9 +38,10 @@ char *temp_file(const void *ctx, const char *extension);
 /* 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);
+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 *objs,
-		       const char *extra_cflags, const char *libs,
-		       char **errmsg);
+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 */