[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Sep 23 02:32:23 MDT 2010
The branch, master has been updated
via de49623 s3-waf: fix LOCALEDIR usage.
via 031dd8c waf: move majority of shared NDR_ subsystems to main wscript_build.
from dc4920b s3-waf: rework libnetapi to have no unresolved symbols.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit de49623d4b3bc577694b1601dcdb2eb413692389
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 23 01:32:43 2010 -0700
s3-waf: fix LOCALEDIR usage.
Guenther
commit 031dd8cc623a315e8776faae687b53d126ecb700
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 21 00:41:58 2010 -0700
waf: move majority of shared NDR_ subsystems to main wscript_build.
(so they can be used by s3 waf later)
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/wscript_build | 208 ++++++++++++++++++++++++++++++++++++
source3/build/dynconfig.py | 2 -
source3/build/wscript | 3 +-
source4/librpc/wscript_build | 240 ------------------------------------------
4 files changed, 210 insertions(+), 243 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 8846a6a..a4b625d 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -2,3 +2,211 @@
bld.RECURSE('idl')
+bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
+ source='../librpc/gen_ndr/ndr_audiosrv.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
+ source='../librpc/gen_ndr/ndr_named_pipe_auth.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
+ source='../librpc/gen_ndr/ndr_dnsserver.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
+ source='../librpc/gen_ndr/ndr_dsbackup.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_EFS',
+ source='../librpc/gen_ndr/ndr_efs.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_ROT',
+ source='../librpc/gen_ndr/ndr_rot.c',
+ public_deps='LIBNDR NDR_ORPC'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
+ source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
+ source='../librpc/gen_ndr/ndr_frsapi.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
+ source='../librpc/gen_ndr/ndr_frstrans.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
+ source='../librpc/gen_ndr/ndr_dfsblobs.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
+ source='../librpc/gen_ndr/ndr_policyagent.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
+ source='../librpc/gen_ndr/ndr_unixinfo.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
+ source='../librpc/gen_ndr/ndr_spoolss.c',
+ public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
+ source='../librpc/ndr/ndr_spoolss_buf.c',
+ deps='talloc'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
+ source='../librpc/gen_ndr/ndr_epmapper.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
+ source='../librpc/gen_ndr/ndr_dbgidl.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
+ source='../librpc/gen_ndr/ndr_dssetup.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
+ source='../librpc/gen_ndr/ndr_msgsvc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_MGMT',
+ source='../librpc/gen_ndr/ndr_mgmt.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
+ source='../librpc/gen_ndr/ndr_protected_storage.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_ORPC',
+ source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
+ source='../librpc/gen_ndr/ndr_oxidresolver.c',
+ public_deps='LIBNDR NDR_ORPC'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_REMACT',
+ source='../librpc/gen_ndr/ndr_remact.c',
+ public_deps='LIBNDR NDR_ORPC'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
+ source='../librpc/gen_ndr/ndr_wzcsvc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
+ source='../librpc/gen_ndr/ndr_browser.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
+ source='../librpc/gen_ndr/ndr_w32time.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
+ source='../librpc/gen_ndr/ndr_scerpc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
+ source='../librpc/gen_ndr/ndr_trkwks.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
+ source='../librpc/gen_ndr/ndr_keysvc.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_RAP',
+ source='../librpc/gen_ndr/ndr_rap.c ../librpc/ndr/ndr_rap.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
+ source='../librpc/gen_ndr/ndr_idmap.c',
+ public_deps='LIBNDR NDR_STANDARD'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
+ source='../librpc/ndr/ndr_ntlmssp.c ../librpc/gen_ndr/ndr_ntlmssp.c',
+ public_deps='LIBNDR NDR_STANDARD'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DNSP',
+ source='../librpc/gen_ndr/ndr_dnsp.c ../librpc/ndr/ndr_dnsp.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
+ source='../librpc/gen_ndr/ndr_ntprinting.c ../librpc/ndr/ndr_ntprinting.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
+ source='../librpc/ndr/ndr_compression.c',
+ public_deps='LIBSAMBA-ERRORS LIBNDR',
+ deps='ZLIB LZXPRESS'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
+ source='../librpc/ndr/ndr_drsuapi.c ../librpc/gen_ndr/ndr_drsuapi.c',
+ public_deps='LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
+ source='../librpc/ndr/ndr_drsblobs.c ../librpc/gen_ndr/ndr_drsblobs.c',
+ public_deps='LIBNDR NDR_DRSUAPI'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
+ source='../librpc/ndr/ndr_krb5pac.c ../librpc/gen_ndr/ndr_krb5pac.c',
+ public_deps='LIBNDR NDR_STANDARD NDR_SECURITY'
+ )
+
+
+bld.SAMBA_SUBSYSTEM('NDR_XATTR',
+ source='../librpc/ndr/ndr_xattr.c ../librpc/gen_ndr/ndr_xattr.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
+ source='../librpc/ndr/ndr_schannel.c ../librpc/gen_ndr/ndr_schannel.c',
+ public_deps='LIBNDR NDR_NBT'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NBT',
+ source='../librpc/gen_ndr/ndr_nbt.c',
+ public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
+ public_headers='../../librpc/gen_ndr/nbt.h',
+ header_path='gen_ndr'
+ )
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index 7382516..d04fe3d 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -11,7 +11,6 @@ dir_options = {
'with-codepagedir' : [ '${PREFIX}/lib/samba', 'where to put codepages' ],
'with-privatedir' : [ '${PREFIX}/private', 'where to put smbpasswd' ],
'with-cachedir' : [ '${PREFIX}/var/locks', 'where to put temporary cache files' ],
- 'with-localedir' : [ '${PREFIX}/share/locale', 'Where to put po files' ]
}
# list of cflags to use for dynconfig.c
@@ -38,7 +37,6 @@ dyn_cflags = {
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
'CODEPAGEDIR' : '${CODEPAGEDIR}',
'CACHEDIR' : '${CACHEDIR}',
- 'LOCALEDIR' : '${LOCALEDIR}',
'SMB_PASSWD_FILE' : '${PRIVATEDIR}/smbpasswd',
}
diff --git a/source3/build/wscript b/source3/build/wscript
index 2cbcbe6..3b0c66a 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -45,7 +45,8 @@ def build(bld):
cflags=cflags)
bld.SAMBA_SUBSYSTEM('LOCALE_DIR',
'../localedir.c',
- cflags=cflags)
+ cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
+
def dynconfig_cflags(bld):
'''work out the extra CFLAGS for dynconfig.c'''
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 65e8260..52df05f 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -21,12 +21,6 @@ bld.SAMBA_BINARY('ndrdump',
)
-bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
- source='../../librpc/ndr/ndr_compression.c',
- public_deps='LIBSAMBA-ERRORS LIBNDR',
- deps='ZLIB LZXPRESS'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c',
@@ -36,24 +30,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
)
-bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
- source='../../librpc/gen_ndr/ndr_audiosrv.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
- source='../../librpc/gen_ndr/ndr_named_pipe_auth.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
- source='../../librpc/gen_ndr/ndr_dnsserver.c',
- public_deps='LIBNDR'
- )
-
-
bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
source='gen_ndr/ndr_winstation.c',
public_deps='LIBNDR'
@@ -78,59 +54,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WMI',
)
-bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
- source='../../librpc/gen_ndr/ndr_dsbackup.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_EFS',
- source='../../librpc/gen_ndr/ndr_efs.c',
- public_deps='LIBNDR NDR_SECURITY'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_ROT',
- source='../../librpc/gen_ndr/ndr_rot.c',
- public_deps='LIBNDR NDR_ORPC'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
- source='../../librpc/ndr/ndr_frsrpc.c ../../librpc/gen_ndr/ndr_frsrpc.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
- source='../../librpc/gen_ndr/ndr_frsapi.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
- source='../../librpc/gen_ndr/ndr_frstrans.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
- source='../../librpc/ndr/ndr_drsuapi.c ../../librpc/gen_ndr/ndr_drsuapi.c',
- public_deps='LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
- source='../../librpc/ndr/ndr_drsblobs.c ../../librpc/gen_ndr/ndr_drsblobs.c',
- public_deps='LIBNDR NDR_DRSUAPI'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
- source='../../librpc/gen_ndr/ndr_dfsblobs.c',
- public_deps='LIBNDR'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS',
source='gen_ndr/ndr_sasl_helpers.c',
@@ -138,17 +61,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS',
)
-bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
- source='../../librpc/gen_ndr/ndr_policyagent.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
- source='../../librpc/gen_ndr/ndr_unixinfo.c',
- public_deps='LIBNDR NDR_SECURITY'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
source='gen_ndr/ndr_nfs4acl.c',
@@ -156,41 +68,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
)
-bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
- source='../../librpc/gen_ndr/ndr_spoolss.c',
- public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
- source='../../librpc/ndr/ndr_spoolss_buf.c',
- deps='talloc'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
- source='../../librpc/gen_ndr/ndr_epmapper.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
- source='../../librpc/gen_ndr/ndr_dbgidl.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
- source='../../librpc/gen_ndr/ndr_dssetup.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
- source='../../librpc/gen_ndr/ndr_msgsvc.c',
- public_deps='LIBNDR'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_WINSIF',
source='gen_ndr/ndr_winsif.c',
@@ -198,89 +75,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSIF',
)
-bld.SAMBA_SUBSYSTEM('NDR_MGMT',
- source='../../librpc/gen_ndr/ndr_mgmt.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
- source='../../librpc/gen_ndr/ndr_protected_storage.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_ORPC',
- source='../../librpc/ndr/ndr_orpc.c ../../librpc/gen_ndr/ndr_orpc.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
- source='../../librpc/gen_ndr/ndr_oxidresolver.c',
- public_deps='LIBNDR NDR_ORPC'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_REMACT',
- source='../../librpc/gen_ndr/ndr_remact.c',
- public_deps='LIBNDR NDR_ORPC'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
- source='../../librpc/gen_ndr/ndr_wzcsvc.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
- source='../../librpc/gen_ndr/ndr_browser.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
- source='../../librpc/gen_ndr/ndr_w32time.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
- source='../../librpc/gen_ndr/ndr_scerpc.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
- source='../../librpc/gen_ndr/ndr_trkwks.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
- source='../../librpc/gen_ndr/ndr_keysvc.c',
- public_deps='LIBNDR'
- )
-
-bld.SAMBA_SUBSYSTEM('NDR_RAP',
- source='../../librpc/gen_ndr/ndr_rap.c ../../librpc/ndr/ndr_rap.c',
- public_deps='LIBNDR'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
- source='../../librpc/ndr/ndr_krb5pac.c ../../librpc/gen_ndr/ndr_krb5pac.c',
- public_deps='LIBNDR NDR_STANDARD NDR_SECURITY'
- )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_XATTR',
- source='../../librpc/ndr/ndr_xattr.c ../../librpc/gen_ndr/ndr_xattr.c',
- public_deps='LIBNDR NDR_SECURITY'
- )
-
-
bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
--
Samba Shared Repository
More information about the samba-cvs
mailing list