tools: don't include submodules in manifest.
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 9 Jul 2015 02:56:48 +0000 (12:26 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 9 Jul 2015 02:56:48 +0000 (12:26 +0930)
They currently get classed as "other_files"; they should be entirely
ignored.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
tools/manifest.c

index 9a8c4cd097d9632387032ad2366ac438e17c1d97..6e246d8bf71de42a37f01ae4779102f57dd8d8ea 100644 (file)
@@ -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);
 }