summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-09 08:17:43 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:47 +1000
commit9cb39847c068305d544bcacd6887c57412e16586 (patch)
treed8bbcba938042f4499c441865ed3173f7d7c7714
parentc6e095de74b82bfaff689168fc4e1d86a0db56a4 (diff)
downloadsamba-9cb39847c068305d544bcacd6887c57412e16586.tar.gz
samba-9cb39847c068305d544bcacd6887c57412e16586.tar.bz2
samba-9cb39847c068305d544bcacd6887c57412e16586.zip
build: better target name for lib link
-rw-r--r--buildtools/wafsamba/wafsamba.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f34ef3b650..2498eedd75 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -201,9 +201,13 @@ def SAMBA_LIBRARY(bld, libname, source,
(sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, libname, deps)
+# bld.SET_TARGET_INCLUDE_LIST(libname, includes)
+
ilist = includes + ' ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps)
ilist = bld.NORMPATH(ilist)
+# print "LIBRARY %s add_objects=%s deps=%s uselib_local=%s ilist=%s" % (libname, add_objects, deps, localdeps, ilist)
+
# this print below should show that we're runnig this code
bld.SET_BUILD_GROUP(group) # <- here
bld(
@@ -234,7 +238,7 @@ def SAMBA_LIBRARY(bld, libname, source,
shell = True,
after = 'cc_link',
always = True,
- name = 'fff' + libname,
+ name = libname + '.link',
)
#print t.rule
LOCAL_CACHE_SET(bld, 'INCLUDE_LIST', libname, ilist)
@@ -271,6 +275,8 @@ def SAMBA_BINARY(bld, binname, source,
"No init_function defined for module '%s' in binary '%s'" % (m, binname))
cflags += ' -DSTATIC_%s_MODULES="%s"' % (m, cache[m])
+# print "BINARY %s add_objects=%s deps=%s uselib_local=%s" % (binname, add_objects, deps, localdeps)
+
bld.SET_BUILD_GROUP(group)
bld(
features = 'cc cprogram',