ccan: make it a grouping library.

Andrew Bartlett pointed out that making CCAN a non-library will break
the build in a different way in future: when two separate private
libraries start using the same CCAN module, the symbol duplicate
detection will fire (since private libaries don't use any symbol
hiding).  That doesn't happen yet, but it will surely happen
eventually.

So, for now at least, we build as a private library again.  This
unfortunately means the top-level build creates a libccan.so, which
contains all the ccan modules whether you need them or not.  Given the
size of the library, I don't think this is a win.  But it's simple.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Sat Jun 30 11:19:04 CEST 2012 on sn-devel-104

diff --git a/lib/ccan/wscript b/lib/ccan/wscript
index c9bb49b25f4319107fc23a7b57907e8f72baf0f4..be5eab23dc8a4ee6143c07a832f225fef06835d9 100644 (file)
--- a/lib/ccan/wscript
+++ b/lib/ccan/wscript
@@ -125,8 +125,11 @@ def ccan_module(bld, name, deps=''):
     bld.SAMBA_SUBSYSTEM('ccan-%s' % name,
                         source=bld.path.ant_glob('%s/*.c' % name),
                         deps=deps)
+    bld.env.CCAN_MODS += 'ccan-%s ' % name
 
 def build(bld):
+    bld.env.CCAN_MODS = ""
+
     # These have actual C files.
     ccan_module(bld, 'hash', 'ccan-build_assert')
     ccan_module(bld, 'ilog', 'ccan-compiler');
@@ -159,3 +162,10 @@ def build(bld):
                     ccan-err ccan-hash ccan-htable ccan-list
                     ccan-read_write_all ccan-str ccan-time execinfo
                     ''')
+
+    # This is the complete CCAN collection as one group.
+    bld.SAMBA_LIBRARY('ccan',
+                      source='',
+                      deps=bld.env.CCAN_MODS,
+                      private_library=True,
+                      grouping_library=True)