From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 25 Sep 2010 15:18:27 +0000 (+0930)
Subject: antithread: update example Makefile and arabella example.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=1f6476b05d7429d0363cb0157b8df4d9fdc690e1

antithread: update example Makefile and arabella example.
---

diff --git a/ccan/antithread/examples/Makefile b/ccan/antithread/examples/Makefile
index f562dd78..ab671559 100644
--- a/ccan/antithread/examples/Makefile
+++ b/ccan/antithread/examples/Makefile
@@ -1,9 +1,7 @@
-CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -I../../..
+CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -I../../.. ../../talloc.o ../../alloc.o ../../noerr.o ../../read_write_all.o ../../antithread.o # -O3
+LDLIBS=-ljpeg -lm
 
-all: dns_lookup
+all: dns_lookup arabella
 
-dns_lookup: dns_lookup.c ../../../libccan.a
-	$(CC) $(CFLAGS) -o $@ $^
-
-arabella: arabella.c ../../../libccan.a
-	$(CC) $(CFLAGS) -o $@ $^ -ljpeg -lm
+clean:
+	rm -f dns_lookup arabella
diff --git a/ccan/antithread/examples/arabella.c b/ccan/antithread/examples/arabella.c
index 61040aa5..5409a656 100644
--- a/ccan/antithread/examples/arabella.c
+++ b/ccan/antithread/examples/arabella.c
@@ -377,7 +377,7 @@ static struct drawing *breed_drawing(const void *ctx,
 
 /* This is our anti-thread.  It does the time-consuming operation of
  * breeding two drawings together and scoring the result. */
-static void *breeder(struct at_pool *atp, const struct image *master)
+static void *breeder(struct at_pool *atp, struct image *master)
 {
 	const struct drawing *a, *b;