tools: fix dependencies.

In particular, we might need the C files for foreach and err.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

tools/Makefile

@@ -1,6 +1,8 @@
 ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
 LDLIBS = -lrt
-DEP_OBJS = ccan/grab_file/grab_file.o \
+DEP_OBJS = ccan/err/err.o \
+	ccan/foreach/foreach.o \
+	ccan/grab_file/grab_file.o \
 	ccan/noerr/noerr.o \
 	ccan/read_write_all/read_write_all.o \
 	ccan/str/debug.o \

tools/ccan_depends.c

@@ -1,7 +1,7 @@
 #include "tools.h"
-#include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <ccan/err/err.h>
 #include <ccan/str/str.h>
 #include <ccan/talloc/talloc.h>
 

tools/depends.c

@@ -4,11 +4,11 @@
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/compiler/compiler.h>
+#include <ccan/err/err.h>
 #include "tools.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <err.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <errno.h>

tools/doc_extract.c

@@ -1,11 +1,11 @@
 /* This merely extracts, doesn't do XML or anything. */
-#include <err.h>
-#include <string.h>
-#include <stdio.h>
 #include <ccan/str/str.h>
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/grab_file/grab_file.h>
+#include <ccan/err/err.h>
+#include <string.h>
+#include <stdio.h>
 #include "doc_extract.h"
 
 /* We regard non-alphanumerics as equiv. */

tools/manifest.c

@@ -12,11 +12,11 @@
 #include <ccan/foreach/foreach.h>
 #include <ccan/asort/asort.h>
 #include <ccan/array_size/array_size.h>
+#include <ccan/err/err.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <err.h>
 #include <errno.h>
 #include <dirent.h>
 #include <ctype.h>

tools/namespacize.c

@@ -1,5 +1,4 @@
 /* Code to move a ccan module into the ccan_ namespace. */
-#include <err.h>
 #include <errno.h>
 #include <string.h>
 #include <stdbool.h>
@@ -14,6 +13,7 @@
 #include "ccan/str_talloc/str_talloc.h"
 #include "ccan/grab_file/grab_file.h"
 #include "ccan/talloc/talloc.h"
+#include "ccan/err/err.h"
 #include "tools.h"
 
 static bool verbose = false;

tools/read_config_header.c

@@ -1,3 +1,4 @@
+#include <ccan/err/err.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/str/str.h>
 #include <ccan/str_talloc/str_talloc.h>
@@ -5,7 +6,6 @@
 #include "read_config_header.h"
 #include "tools.h"
 #include <string.h>
-#include <err.h>
 
 /* Get an identifier token. */
 char *get_symbol_token(void *ctx, const char **line)

tools/tools.c

@@ -1,5 +1,6 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/grab_file/grab_file.h>
+#include <ccan/err/err.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/noerr/noerr.h>
@@ -13,7 +14,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <err.h>
 #include <unistd.h>
 #include <assert.h>
 #include <signal.h>