Simplify -I lines: change includes to ccan/

[ccan] / tools / tools.h

diff --git a/tools/tools.h b/tools/tools.h
index 841265f99ad914e58ffcd918ffa926dd2f00a857..a7612c7a4022043f76c40e929dbc362fddc1ef58 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -1,17 +1,14 @@
 #ifndef CCAN_TOOLS_H
 #define CCAN_TOOLS_H
+#include <stdbool.h>
 
-#define CFLAGS "-O3 -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I."
+#define CFLAGS "-O3 -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I."
 
-char **split(const void *ctx, const char *text, const char *delims,
-            unsigned int *nump);
+/* This actually compiles and runs the _info.c file to get dependencies. */
+char **get_deps(const void *ctx, const char *dir, bool recurse);
 
-char **get_deps(const void *ctx, const char *dir);
-
-void *grab_fd(const void *ctx, int fd);
-void *grab_file(const void *ctx, const char *filename);
-
-#define streq(a,b) (strcmp((a),(b)) == 0)
+/* This is safer: just looks for ccan/ strings in _info.c */
+char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse);
 
 #endif /* CCAN_TOOLS_H */