From d0d65608c45c7c73bdd6cf57d7f7c44c402dc03a Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 22 Nov 2012 10:08:53 +1030
Subject: [PATCH] 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             | 4 +++-
 tools/ccan_depends.c       | 2 +-
 tools/depends.c            | 2 +-
 tools/doc_extract.c        | 6 +++---
 tools/manifest.c           | 2 +-
 tools/namespacize.c        | 2 +-
 tools/read_config_header.c | 2 +-
 tools/tools.c              | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index da235327..c60f0696 100644
--- a/tools/Makefile
+++ b/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 \
diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index 6d1f7429..bfaa5c4e 100644
--- a/tools/ccan_depends.c
+++ b/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>
 
diff --git a/tools/depends.c b/tools/depends.c
index 441c2c47..3dcd9d38 100644
--- a/tools/depends.c
+++ b/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>
diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index b8190388..f792b57b 100644
--- a/tools/doc_extract.c
+++ b/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. */
diff --git a/tools/manifest.c b/tools/manifest.c
index e368b4ed..4cf540bd 100644
--- a/tools/manifest.c
+++ b/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>
diff --git a/tools/namespacize.c b/tools/namespacize.c
index 156b0f91..0cbd6734 100644
--- a/tools/namespacize.c
+++ b/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;
diff --git a/tools/read_config_header.c b/tools/read_config_header.c
index b168a2f9..e71db697 100644
--- a/tools/read_config_header.c
+++ b/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)
diff --git a/tools/tools.c b/tools/tools.c
index 5b6581e5..77349d93 100644
--- a/tools/tools.c
+++ b/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>
-- 
2.39.2