summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2015-07-09 12:26:48 +0930
committerRusty Russell <rusty@rustcorp.com.au>2015-07-09 12:26:48 +0930
commit7a7fa0848182fa4ab8d5507cc01fdde45b9c09a3 (patch)
tree0fef30adb7b3e4dd8b54a20426b231b09a324f95
parentb2c6f0ac7d732bcab5113026ba3297a07e82ffec (diff)
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>
-rw-r--r--tools/manifest.c11
1 files changed, 9 insertions, 2 deletions
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);
}