The branch, master has been updated
via 3ca5fd8... build: cope with perl not being in /usr/bin/perl
via 211bf1e... s4-waf: removed the unused installdir= option to
SAMBA_BINARY()
from f8e3e5c... build: fixed install of binary targets that are in
subdirs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3ca5fd8e030c485e2b1df1bac9f4cd7fcd4041ef
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Apr 18 22:55:16 2010 +1000
build: cope with perl not being in /usr/bin/perl
This should fixed the pidl build on SerNet-NetBSD5
commit 211bf1ea170966eb283e45339806ac45aec44d58
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Apr 18 21:47:00 2010 +1000
s4-waf: removed the unused installdir= option to SAMBA_BINARY()
This was left over from the automatic conversion of the config.mk
files
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_pidl.py | 2 +-
buildtools/wafsamba/wafsamba.py | 1 -
libcli/nbt/wscript_build | 1 -
nsswitch/wscript_build | 2 --
source4/client/wscript_build | 2 --
source4/lib/registry/wscript_build | 4 ----
source4/lib/wmi/wscript_build | 2 --
source4/librpc/wscript_build | 1 -
source4/smbd/wscript_build | 1 -
source4/torture/wscript_build | 4 ----
source4/utils/net/wscript_build | 1 -
source4/utils/wscript_build | 4 ----
12 files changed, 1 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 0b149cc..00098de 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -56,7 +56,7 @@ def SAMBA_PIDL(bld, pname, source,
pidl_src_nodes = bld.pidl_files_cache
# the cd .. is needed because pidl currently is sensitive to the directory
it is run in
- t = bld(rule='cd .. && ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR}
-- ${SRC[0].abspath(env)}',
+ t = bld(rule='cd .. && ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir
${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
ext_out = '.c',
before = 'cc',
on_results = True,
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1714718..a750a16 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -212,7 +212,6 @@ def SAMBA_BINARY(bld, binname, source,
public_headers=None,
header_path=None,
modules=None,
- installdir=None,
ldflags=None,
cflags='',
autoproto=None,
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index b85a5d7..726b4c8 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -16,7 +16,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NBT',
bld.SAMBA_BINARY('nmblookup',
source='tools/nmblookup.c',
manpages='man/nmblookup.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA
LIBNETIF LIBCLI_RESOLVE'
)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 90c527b..e13b4dc 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -9,14 +9,12 @@ bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
- installdir='BINDIR',
deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
)
bld.SAMBA_BINARY('wbinfo',
source='wbinfo.c',
- installdir='BINDIR',
deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT
LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
)
diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index 08dc90c..d35b6a8 100644
--- a/source4/client/wscript_build
+++ b/source4/client/wscript_build
@@ -2,14 +2,12 @@
bld.SAMBA_BINARY('smbclient',
source='client.c',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG SMBREADLINE LIBSAMBA-UTIL LIBCLI_SMB
RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_RAW'
)
bld.SAMBA_BINARY('cifsdd',
source='cifsdd.c cifsddio.c',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
)
diff --git a/source4/lib/registry/wscript_build
b/source4/lib/registry/wscript_build
index 66f2aa8..1b34f79 100644
--- a/source4/lib/registry/wscript_build
+++ b/source4/lib/registry/wscript_build
@@ -29,7 +29,6 @@ bld.SAMBA_SUBSYSTEM('registry_common',
bld.SAMBA_BINARY('regdiff',
source='tools/regdiff.c',
manpages='man/regdiff.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS'
)
@@ -37,7 +36,6 @@ bld.SAMBA_BINARY('regdiff',
bld.SAMBA_BINARY('regpatch',
source='tools/regpatch.c',
manpages='man/regpatch.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS
registry_common'
)
@@ -45,7 +43,6 @@ bld.SAMBA_BINARY('regpatch',
bld.SAMBA_BINARY('regshell',
source='tools/regshell.c',
manpages='man/regshell.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS
SMBREADLINE registry_common'
)
@@ -53,7 +50,6 @@ bld.SAMBA_BINARY('regshell',
bld.SAMBA_BINARY('regtree',
source='tools/regtree.c',
manpages='man/regtree.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS
registry_common'
)
diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
index 6efc0bf..5984c23 100644
--- a/source4/lib/wmi/wscript_build
+++ b/source4/lib/wmi/wscript_build
@@ -9,14 +9,12 @@ bld.SAMBA_SUBSYSTEM('WMI',
bld.SAMBA_BINARY('wmic',
source='tools/wmic.c',
- installdir='BINDIR',
deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
)
bld.SAMBA_BINARY('wmis',
source='tools/wmis.c',
- installdir='BINDIR',
deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index fb062e6..f9a5eab 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -17,7 +17,6 @@ bld.SAMBA_LIBRARY('LIBNDR',
bld.SAMBA_BINARY('ndrdump',
source='../../librpc/tools/ndrdump.c',
manpages='../../librpc/tools/ndrdump.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA NDR_TABLE
LIBSAMBA-ERRORS'
)
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 815b586..22a1d6b 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -17,7 +17,6 @@ bld.SAMBA_SUBSYSTEM('PIDFILE',
bld.SAMBA_BINARY('samba',
source='server.c',
manpages='samba.8',
- installdir='SBINDIR',
subsystem_name='service',
deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG
LIBSAMBA-UTIL POPT_SAMBA PIDFILE
popt gensec registry ntptr ntvfs share CLUSTER DCESRV''',
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 79deefb..3fa66b6 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -135,7 +135,6 @@ bld.SAMBA_BINARY('smbtorture',
source='smbtorture.c torture.c',
manpages='man/smbtorture.1',
public_headers='smbtorture.h',
- installdir='BINDIR',
deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB
SMBREADLINE ' + TORTURE_MODULES,
needs_python=True
)
@@ -144,7 +143,6 @@ bld.SAMBA_BINARY('smbtorture',
bld.SAMBA_BINARY('gentest',
source='gentest.c',
manpages='man/gentest.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA
POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW'
)
@@ -152,7 +150,6 @@ bld.SAMBA_BINARY('gentest',
bld.SAMBA_BINARY('masktest',
source='masktest.c',
manpages='man/masktest.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA
POPT_CREDENTIALS LIBCLI_SMB'
)
@@ -165,6 +162,5 @@ bld.SAMBA_BINARY('locktest',
# GCOV='1',
manpages='man/locktest.1',
deps='popt POPT_SAMBA POPT_CREDENTIALS LIBSAMBA-UTIL LIBCLI_SMB
LIBSAMBA-HOSTCONFIG',
- installdir='BINDIR'
)
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index af1a0c9..fc0db09 100644
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -12,7 +12,6 @@ bld.SAMBA_MODULE('net_drs',
bld.SAMBA_BINARY('net',
source='net.c net_password.c net_join.c net_vampire.c',
autoproto='net_proto.h',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA
POPT_CREDENTIALS net_drs',
needs_python=True
)
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 00965a7..5056cc0 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,6 @@
bld.SAMBA_BINARY('ntlm_auth',
source='ntlm_auth.c',
manpages='man/ntlm_auth.1',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA
POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS
service',
needs_python=True
)
@@ -11,14 +10,12 @@ bld.SAMBA_BINARY('ntlm_auth',
bld.SAMBA_BINARY('setnttoken',
source='setnttoken.c',
- installdir='BINDIR',
deps='talloc'
)
bld.SAMBA_BINARY('testparm',
source='testparm.c',
- installdir='BINDIR',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt samba_socket POPT_SAMBA
LIBCLI_RESOLVE CHARSET'
)
@@ -26,7 +23,6 @@ bld.SAMBA_BINARY('testparm',
bld.SAMBA_BINARY('oLschema2ldif',
source='oLschema2ldif.c',
manpages='man/oLschema2ldif.1',
- installdir='BINDIR',
deps='LIBLDB_CMDLINE SAMDB'
)
--
Samba Shared Repository
