From 1ba533f4cb7a7274a3c49dd69a30e20f579738a2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 4 Sep 2010 02:18:31 +0200
Subject: waf: Make shared modules available in the build dir.

---
 buildtools/wafsamba/samba_install.py | 5 +++++
 buildtools/wafsamba/wafsamba.py      | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 488729bc51..f4ca26353d 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -150,6 +150,11 @@ def symlink_lib(self):
         if os.path.islink(link_target) and os.readlink(link_target) == libpath:
             return
         os.unlink(link_target)
+
+    link_container = os.path.dirname(link_target)
+    if not os.path.isdir(link_container):
+        os.mkdir(link_container)
+
     os.symlink(libpath, link_target)
 
 
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c24d82b930..43c5628139 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -59,7 +59,7 @@ def SAMBA_BUILD_ENV(conf):
     # this allows all of the bin/shared and bin/python targets
     # to be expressed in terms of build directory paths
     mkdir_p(os.path.join(conf.blddir, 'default'))
-    for p in ['python','shared']:
+    for p in ['python','shared', 'modules']:
         link_target = os.path.join(conf.blddir, 'default/' + p)
         if not os.path.lexists(link_target):
             os.symlink('../' + p, link_target)
@@ -351,7 +351,7 @@ def SAMBA_MODULE(bld, modname, source,
 
     obj_target = modname + '.objlist'
 
-    realname = modname 
+    realname = modname
     if subsystem is not None:
         deps += ' ' + subsystem
         while realname.startswith("lib"+subsystem+"_"):
@@ -363,6 +363,8 @@ def SAMBA_MODULE(bld, modname, source,
     while realname.startswith("lib"):
         realname = realname[len("lib"):]
 
+    build_link_name = "modules/%s/%s" % (subsystem, realname)
+
     bld.SAMBA_LIBRARY(modname,
                       source,
                       deps=deps,
@@ -371,6 +373,7 @@ def SAMBA_MODULE(bld, modname, source,
                       autoproto = autoproto,
                       local_include=local_include,
                       vars=vars,
+                      link_name=build_link_name,
                       install_path="${MODULESDIR}/%s" % subsystem
                       )
 
-- 
cgit