From 14f99167f600ae9a3351d4ff7d089e54ca3149ac Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 May 2011 11:00:18 +0200 Subject: build: Remove --disable-s3build so we can rely on these subsystems This will make it easier to write code that uses the whole codebase. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104 --- source4/librpc/wscript_build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source4/librpc/wscript_build') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index ce015ccaa5..e9456074f6 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -92,11 +92,6 @@ bld.SAMBA_LIBRARY('dcerpc-samba4', bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c') -if bld.env.enable_s3build: - s3_ndr = "NDR_WBINT" -else: - s3_ndr = "" - bld.SAMBA_SUBSYSTEM('ndr-table', source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c', public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS @@ -109,7 +104,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table', NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP - NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG ''' + s3_ndr, + NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''', depends_on='GEN_NDR_TABLES' ) -- cgit From d057116cc2e454ba097d0dcb22e16108a05a4a1b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 10:55:20 +1000 Subject: server_id.idl: Bring server_id.idl in common Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/librpc/wscript_build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source4/librpc/wscript_build') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index e9456074f6..efde567bf8 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -4,13 +4,6 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('../../librpc/tools') bld.RECURSE('idl') -bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4', - source='gen_ndr/ndr_server_id4.c', - deps='ndr', - public_headers='gen_ndr/server_id4.h', - header_path='gen_ndr' - ) - bld.SAMBA_SUBSYSTEM('NDR_WINSTATION', source='gen_ndr/ndr_winstation.c', @@ -52,7 +45,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_s4_notify.c', - public_deps='ndr NDR_SERVER_ID4' + public_deps='ndr NDR_SERVER_ID' ) -- cgit From a772797a384a1142c5af95bd06c14a141dea38d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 11:10:12 +1000 Subject: librpc/idr Use the Samba3 notify.idl in common. The extra fields in the structure that Samba4 does not use should not bother it. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/librpc/wscript_build | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source4/librpc/wscript_build') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index efde567bf8..39541b6a33 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -43,12 +43,6 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', ) -bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', - source='gen_ndr/ndr_s4_notify.c', - public_deps='ndr NDR_SERVER_ID' - ) - - bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND', source='gen_ndr/ndr_ntp_signd.c', public_deps='ndr' @@ -69,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND', # create a grouping library to consolidate our samba4 specific NDR code bld.SAMBA_LIBRARY('ndr-samba4', source=[], - deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY ndr-table', + deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB ndr-table', private_library=True, grouping_library=True ) -- cgit