From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 9 Jul 2015 02:56:48 +0000 (+0930)
Subject: tools: don't include submodules in manifest.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=7a7fa0848182fa4ab8d5507cc01fdde45b9c09a3;ds=sidebyside

tools: don't include submodules in manifest.

They currently get classed as "other_files"; they should be entirely
ignored.

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

diff --git a/tools/manifest.c b/tools/manifest.c
index 9a8c4cd0..6e246d8b 100644
--- a/tools/manifest.c
+++ b/tools/manifest.c
@@ -169,8 +169,15 @@ static void add_files(struct manifest *m, const char *base, const char *subdir)
 		    && list_empty(&m->h_files))
 			errx(1, "No _info, C or H files found here!");
 
-		for (i = 0; i < tal_count(subs); i++)
-			add_files(m, base, subs[i]);
+		/* Don't enter subdirs with _info: they're separate modules. */
+		for (i = 0; i < tal_count(subs); i++) {
+			struct stat st;
+			char *subinfo = path_join(subs, base,
+						  path_join(subs, subs[i],
+							    "_info"));
+			if (lstat(subinfo, &st) != 0)
+				add_files(m, base, subs[i]);
+		}
 	}
 	tal_free(subs);
 }