From f3862b917168ade88a048cdee688986b0479fe37 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 29 Jun 2012 12:09:06 +0930 Subject: ccan: we're subsystems, not a library. Don't expose a libccan.so; it would produce clashes if someone else does the same thing. Unfortunately, if we just change it from a SAMBA_LIBRARY to a SAMBA_SUBSYSTEM, it doesn't create a static library as we'd like, but links all the object files in. This means we get many duplicates (eg. everyone gets a copy of tally, even though only ntdb wants it). So, the solution is twofold: 1) Make the ccan modules separate. 2) Make the ccan modules SAMBA_SUBSYSTEMs not SAMBA_LIBRARYs so we don't build shared libraries which we can't share. 3) Make the places which uses ccan explicit. Signed-off-by: Rusty Russell Autobuild-User(master): Rusty Russell Autobuild-Date(master): Fri Jun 29 06:22:44 CEST 2012 on sn-devel-104 --- lib/tdb_compat/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/tdb_compat') diff --git a/lib/tdb_compat/wscript b/lib/tdb_compat/wscript index 5f33f6d70b..2eac1e9223 100644 --- a/lib/tdb_compat/wscript +++ b/lib/tdb_compat/wscript @@ -7,12 +7,10 @@ def set_options(opt): def configure(conf): conf.RECURSE('lib/tdb') - conf.RECURSE('lib/ccan') def build(bld): - bld.RECURSE('lib/ccan') bld.RECURSE('lib/tdb') bld.SAMBA_LIBRARY('tdb_compat', source='tdb_compat.c', - deps='replace tdb ccan', + deps='replace tdb', private_library=True) -- cgit