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/ldb/wscript | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/ldb') diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 94a9682df9..6cdddb30e9 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -16,7 +16,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba') import wafsamba, samba_dist, Options samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc - lib/tdb:lib/tdb lib/tdb2:lib/tdb2 lib/tdb:lib/tdb lib/ccan:lib/ccan lib/tevent:lib/tevent lib/popt:lib/popt + lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent lib/popt:lib/popt buildtools:buildtools''') @@ -39,9 +39,6 @@ def configure(conf): conf.check_python_version((2,4,2)) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) - # This make #include work. - conf.ADD_EXTRA_INCLUDES('''#lib''') - # where does the default LIBDIR end up? in conf.env somewhere? # conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') -- cgit