Makefile: score nested modules.

[ccan] / tools / manifest.h

diff --git a/tools/manifest.h b/tools/manifest.h
index 588efe5f0185f0c5941cfaeb489d8ff930a589d9..3b6eb2077f4c87049d7d1df775c98198425f7dc3 100644 (file)
--- a/tools/manifest.h
+++ b/tools/manifest.h
@@ -13,7 +13,9 @@ enum compile_type {
 
 struct manifest {
        char *dir;
-       /* The module name, ie. final element of dir name */
+       /* The name of the module, ie. elements of dir name after ccan/. */
+       char *modname;
+       /* The final element of dir name */
        char *basename;
        struct ccan_file *info_file;
 
@@ -38,6 +40,7 @@ struct manifest {
 
        /* From tests/check_depends_exist.c */
        struct list_head deps;
+       struct list_head test_deps;
 
        /* From tests/license_exists.c */
        enum license license;
@@ -89,7 +92,4 @@ const char *get_ccan_file_contents(struct ccan_file *f);
 /* Use this rather than accessing f->lines directly: loads on demand. */
 char **get_ccan_file_lines(struct ccan_file *f);
 
-/* Where is the ccan dir?  Available after first manifest. */
-extern const char *ccan_dir;
-
 #endif /* CCAN_TOOLS_MANIFEST_H */