libccan.a: simple way to use all of ccan.

diff --git a/Makefile b/Makefile
index 03d0b82b2c9867caed2cc5f039cad8ecbe153492..405ed8e06313997c1d0970223c86e821e37b066a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,12 @@ CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
 ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
 ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
-ALL_LIBS=$(patsubst %, ccan/lib%.a, $(ALL))
+ALL_LIBS=$(patsubst %, ccan/%.o, $(ALL))
 
-test: $(ALL_DIRS:%=test-%)
+libccan.a: $(ALL_LIBS)
+       $(AR) r $@ $^
+
+check: $(ALL_DIRS:%=test-%)
 
 distclean: clean
        rm -f */_info
@@ -19,13 +22,10 @@ $(ALL_DEPENDS): $(ALL_DIRS:=/_info)
 $(ALL_DEPENDS): %/.depends: tools/ccan_depends
        tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
-foo:
-       echo $(ALL_LIBS)
-
 $(ALL_LIBS):
-       $(AR) r $@ $^
+       $(LD) -r -o $@ $^ /dev/null
 
-test-ccan/%: tools/run_tests ccan/lib%.a
+test-ccan/%: tools/run_tests ccan/%.o
        @echo Testing $*...
        @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
 
@@ -36,13 +36,13 @@ clean: tools-clean
        $(RM) inter-depends lib-depends test-depends
 
 inter-depends: $(ALL_DEPENDS)
-       for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/lib\1.a,p' < $$f`; done > $@
+       for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),ccan/\1.o,p' < $$f`; done > $@
 
 test-depends: $(ALL_DEPENDS)
        for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; done > $@
 
 lib-depends: $(foreach D,$(ALL),$(wildcard $D/*.[ch]))
-       for c in $(ALL); do echo ccan/lib$$c.a: `ls ccan/$$c/*.c | grep -v /_info.c | sed 's/.c$$/.o/'`; done > $@
+       for c in $(ALL); do echo ccan/$$c.o: `ls ccan/$$c/*.c | grep -v /_info.c | sed 's/.c$$/.o/'`; done > $@
 
 include tools/Makefile
 -include inter-depends

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 2f657d0533ee8c92e5916ca09c529407b80d5257..a1fbc614918851e50657adb8bfa53caeba695297 100644 (file)
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -106,14 +106,11 @@ static int build(const char *dir, const char *name, int fail)
        char **deps;
 
        for (deps = get_deps(objs, dir); *deps; deps++) {
-               char *end;
                if (!strstarts(*deps, "ccan/"))
                        continue;
 
-               end = strrchr(*deps, '/') + 1;
-               /* ccan/foo -> ccan/libfoo.a */
-               externals = talloc_asprintf_append(externals,
-                                                  " ccan/lib%s.a", end);
+               /* ccan/foo -> ccan/foo.o */
+               externals = talloc_asprintf_append(externals, " %s.o", *deps);
        }
 
        cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s%s%s",