ccanlint: examples_compile depends on build, which depends on build_objs

[ccan] / tools / ccanlint / tests / examples_compile.c

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 31b0a3ae8b1bef0cb306537a99772b5158cc3ecb..ae0d16d62a8cedd81a5542f88c55dd2c98d71e6c 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -67,20 +67,22 @@ static char *add_dep(const struct manifest *m, char *list, const char *mod)
        return list;
 }
 
+/* FIXME: Merge this into one place. */
 static char *obj_list(const struct manifest *m, struct ccan_file *f)
 {
        char *list = talloc_strdup(m, "");
-       struct ccan_file *i;
+       struct manifest *subm;
        char **lines;
 
-       /* Object files for this module. */
-       list_for_each(&m->c_files, i, list)
-               list = talloc_asprintf_append(list, " %s", i->compiled);
+       /* This module. */
+       if (m->compiled)
+               list = talloc_asprintf_append(list, " %s", m->compiled);
 
        /* Other ccan modules we depend on. */
-       list_for_each(&m->dep_dirs, i, list) {
-               if (i->compiled)
-                       list = talloc_asprintf_append(list, " %s", i->compiled);
+       list_for_each(&m->deps, subm, list) {
+               if (subm->compiled)
+                       list = talloc_asprintf_append(list, " %s",
+                                                     subm->compiled);
        }
 
        /* Other modules implied by includes. */
@@ -151,7 +153,7 @@ static char *add_func(char *others, const char *line)
        }
 
        return talloc_asprintf_append(others, "printf(\"%%p\", %.*s);\n",
-                                     (unsigned)(end - p + 1), p);
+                                     (unsigned)(end - p), p+1);
 }
 
 static void strip_leading_whitespace(char **lines)
@@ -597,4 +599,4 @@ struct ccanlint examples_compile = {
        .can_run = can_run,
 };
 
-REGISTER_TEST(examples_compile, &has_examples, &build_objs, NULL);
+REGISTER_TEST(examples_compile, &has_examples, &build, NULL);