tools: fix dependencies.

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

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

diff --git a/tools/Makefile b/tools/Makefile
index da2353271b3246c6203db26826a0c8c766ad9a2c..c60f06968b045ad271cc5d6689b88eef2454b265 100644 (file)
--- 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
 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 \
        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 6d1f74297b30a01438ca10cb82e2eeaf65a7f962..bfaa5c4e1c9bef5e19867f0ab783215b53360d8b 100644 (file)
--- a/tools/ccan_depends.c
+++ b/tools/ccan_depends.c
@@ -1,7 +1,7 @@
 #include "tools.h"
 #include "tools.h"

-#include <err.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>

+#include <ccan/err/err.h>

 #include <ccan/str/str.h>
 #include <ccan/talloc/talloc.h>
 
 #include <ccan/str/str.h>
 #include <ccan/talloc/talloc.h>
 

diff --git a/tools/depends.c b/tools/depends.c
index 441c2c47b79408bca0b4d290ad78d94ec124e0f0..3dcd9d38e2c8cae54dc37867422cd6bc8b108cc4 100644 (file)
--- 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/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 "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>
 #include <stdbool.h>
 #include <unistd.h>
 #include <errno.h>

diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index b819038888c9df5aee2f879c11eac5b2e7f669a8..f792b57b461212aff185fa4aa84e31f6b2ef82a6 100644 (file)
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -1,11 +1,11 @@
 /* This merely extracts, doesn't do XML or anything. */
 /* 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/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. */
 #include "doc_extract.h"
 
 /* We regard non-alphanumerics as equiv. */

diff --git a/tools/manifest.c b/tools/manifest.c
index e368b4ed1e2a8b0470218cc30a42aa7f5da3547d..4cf540bd477bbabdc31e55e22503d1068170285d 100644 (file)
--- 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/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 <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>
 #include <errno.h>
 #include <dirent.h>
 #include <ctype.h>

diff --git a/tools/namespacize.c b/tools/namespacize.c
index 156b0f91e9aab628d5285dd4e3285fe81f4bbebe..0cbd67342d40205419d522f8c7adfcf55acb0b73 100644 (file)
--- a/tools/namespacize.c
+++ b/tools/namespacize.c
@@ -1,5 +1,4 @@
 /* Code to move a ccan module into the ccan_ namespace. */
 /* Code to move a ccan module into the ccan_ namespace. */

-#include <err.h>

 #include <errno.h>
 #include <string.h>
 #include <stdbool.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/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;
 #include "tools.h"
 
 static bool verbose = false;

diff --git a/tools/read_config_header.c b/tools/read_config_header.c
index b168a2f9494d50024410786159aeabef669c03df..e71db697d5b160959f1e864eb5c5fee54d554e11 100644 (file)
--- 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>
 #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 "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)
 
 /* Get an identifier token. */
 char *get_symbol_token(void *ctx, const char **line)

diff --git a/tools/tools.c b/tools/tools.c
index 5b6581e5fc068c69218c4823672fef13a286c58e..77349d93c33b463e4dc5e18617d90d5229f497b4 100644 (file)
--- 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/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>
 #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 <unistd.h>
 #include <stdarg.h>
 #include <errno.h>

-#include <err.h>

 #include <unistd.h>
 #include <assert.h>
 #include <signal.h>
 #include <unistd.h>
 #include <assert.h>
 #include <signal.h>