waf: add a dependency between the library and its vscript

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Dec  9 04:32:18 CET 2010 on sn-devel-104

diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index d5376ca1e7837abac9e3519bacfa68bd7941c6b3..a4c9f68ccd4438cc0889c4969d25a9ea11acf797 100644 (file)
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -201,5 +201,5 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript):
                             target=vscript)
     t.env.VERSION = version
     t.env.LIBNAME = libname
-    t.vars = [libname, version, vscript]
+    t.vars = ['LIBNAME', 'VERSION']
 Build.BuildContext.ABI_VSCRIPT = ABI_VSCRIPT

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index ef5aaba771c9952e16336a05cc472f7bc07ce870..fa910886a3d33893a74d8eb8572cc33d401618a3 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -218,6 +218,8 @@ def SAMBA_LIBRARY(bld, libname, source,
         if version:
             bld.ABI_VSCRIPT(libname, abi_directory, version, vscript)
             ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
+            fullname = bld.env.shlib_PATTERN % bundled_name
+            bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript))
 
     bld.SET_BUILD_GROUP(group)
     t = bld(