X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=c9cf88164cd81e37b4981e1e7da1f5a51756609d;hp=d215441eead6acebe84b629d2b3c855b4191098c;hb=6e1450e6bf9b3bb2392dbdc500447f2ea5cffab7;hpb=023f704e8089f64bd7a77bb7f95b8ea5355fe640

diff --git a/tools/depends.c b/tools/depends.c
index d215441e..c9cf8816 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,5 +1,7 @@
-#include "talloc/talloc.h"
-#include "string/string.h"
+#include <ccan/talloc/talloc.h>
+#include <ccan/str/str.h>
+#include <ccan/grab_file/grab_file.h>
+#include <ccan/str_talloc/str_talloc.h>
 #include "tools.h"
 #include <err.h>
 #include <stdbool.h>
@@ -37,8 +39,8 @@ static int unlink_info(char *infofile)
 /* Be careful about trying to compile over running programs (parallel make) */
 static char *compile_info(const void *ctx, const char *dir)
 {
-	char *infofile = talloc_asprintf(ctx, "%s/_info.%u", dir, getpid());
-	char *cmd = talloc_asprintf(ctx, "cc " CFLAGS " -o %s %s/_info.c",
+	char *infofile = talloc_asprintf(ctx, "%s/info.%u", dir, getpid());
+	char *cmd = talloc_asprintf(ctx, "cc " CFLAGS " -o %s -x c %s/_info",
 				    infofile, dir);
 	talloc_set_destructor(infofile, unlink_info);
 	if (system(cmd) != 0)
@@ -96,7 +98,7 @@ static char **get_one_safe_deps(const void *ctx,
 	char **deps, **lines, *raw, *fname;
 	unsigned int i, n = 0;
 
-	fname = talloc_asprintf(ctx, "%s/_info.c", dir);
+	fname = talloc_asprintf(ctx, "%s/_info", dir);
 	raw = grab_file(fname, fname, NULL);
 	if (!raw)
 		errx(1, "Could not open %s", fname);
@@ -110,6 +112,10 @@ static char **get_one_safe_deps(const void *ctx,
 		char *str;
 		unsigned int len;
 
+		/* Ignore lines starting with # (e.g. #include) */
+		if (lines[i][0] == '#')
+			continue;
+
 		/* Start of line, or after ". */
 		if (strstarts(lines[i], "ccan/"))
 			str = lines[i];