From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 6 Dec 2010 02:19:31 +0000 (+1030)
Subject: ccanlint: examples_compile depends on build, which depends on build_objs
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=9cca4b73c96adeb39ab89027eca9ea5323a3a598;hp=9d511cc5b12021b6c6c079fc5b08487fdf361a26

ccanlint: examples_compile depends on build, which depends on build_objs

We might as well use the compiled .o rather than all the little .o files.
---

diff --git a/tools/ccanlint/compulsory_tests/build.c b/tools/ccanlint/compulsory_tests/build.c
index 5bea548c..21fbdcde 100644
--- a/tools/ccanlint/compulsory_tests/build.c
+++ b/tools/ccanlint/compulsory_tests/build.c
@@ -80,4 +80,4 @@ struct ccanlint build = {
 	.can_run = can_build,
 };
 
-REGISTER_TEST(build, &depends_built, NULL);
+REGISTER_TEST(build, &depends_built, &build_objs, NULL);
diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 87a6ad02..ae0d16d6 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -71,13 +71,12 @@ static char *add_dep(const struct manifest *m, char *list, const char *mod)
 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->deps, subm, list) {
@@ -600,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);