The branch, master has been updated via 1b022d1... s3-waf: Try to fix the idl build. via 5af3177... s3-waf: Create a variable for LIBNDR_NTPRINTING_SRC. via 53e0421... waf: Generate the ntprinting ndr functions. via 45c7f83... s3-waf: Fixed the rpc_client build. from b3f9345... Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1b022d1d3d613d2299350f9c8cea8cec4510d0b2 Author: Andreas Schneider <a...@samba.org> Date: Mon Aug 16 21:30:26 2010 +0200 s3-waf: Try to fix the idl build. commit 5af3177dbd79c3fe494ae82509a37368c8caf204 Author: Andreas Schneider <a...@samba.org> Date: Mon Aug 16 20:35:31 2010 +0200 s3-waf: Create a variable for LIBNDR_NTPRINTING_SRC. commit 53e0421300f6f1d8e143eddda8bec9221b73e6bb Author: Andreas Schneider <a...@samba.org> Date: Mon Aug 16 20:25:46 2010 +0200 waf: Generate the ntprinting ndr functions. commit 45c7f83ccb2822564ec8df3c41b5c0a9dead6e9c Author: Andreas Schneider <a...@samba.org> Date: Mon Aug 16 20:35:16 2010 +0200 s3-waf: Fixed the rpc_client build. ----------------------------------------------------------------------- Summary of changes: librpc/idl/wscript_build | 2 +- source3/librpc/idl/wscript_build | 1 + source3/wscript_build | 46 ++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 25 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build index 89bd83e..e8723ce 100644 --- a/librpc/idl/wscript_build +++ b/librpc/idl/wscript_build @@ -20,6 +20,6 @@ bld.SAMBA_PIDL_LIST('PIDL', output_dir='../gen_ndr') bld.SAMBA_PIDL_LIST('PIDL', - 'rap.idl idmap.idl dnsp.idl', + 'rap.idl idmap.idl dnsp.idl ntprinting.idl', options='--header --ndr-parser', output_dir='../gen_ndr') diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build index 1efcc30..92f2ebd 100644 --- a/source3/librpc/idl/wscript_build +++ b/source3/librpc/idl/wscript_build @@ -1,3 +1,4 @@ +#!/usr/bin/env python bld.SAMBA_PIDL_LIST('PIDL', '''messaging.idl libnetapi.idl notify.idl diff --git a/source3/wscript_build b/source3/wscript_build index 83a6970..27eb256 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -54,8 +54,6 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c librpc/ndr/util.c ../librpc/gen_ndr/ndr_dcerpc.c''' -RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c''' - LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c ../librpc/gen_ndr/ndr_lsa.c''' @@ -88,6 +86,9 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c ../librpc/gen_ndr/ndr_ntsvcs.c ${LIBNDR_SPOOLSS_SRC}''' +LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c + ../librpc/ndr/ndr_ntprinting.c''' + # this includes only the low level parse code, not stuff # that requires knowledge of security contexts REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' @@ -293,22 +294,22 @@ LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c ../librpc/rpc/binding.c''' DCERPC_CLIENT_GEN_SRC = ''' - librpc/gen_ndr/ndr_lsa_c.c - librpc/gen_ndr/ndr_dfs_c.c - librpc/gen_ndr/ndr_echo_c.c - librpc/gen_ndr/ndr_srvsvc_c.c - librpc/gen_ndr/ndr_svcctl_c.c - librpc/gen_ndr/ndr_winreg_c.c - librpc/gen_ndr/ndr_initshutdown_c.c - librpc/gen_ndr/ndr_eventlog_c.c - librpc/gen_ndr/ndr_wkssvc_c.c - librpc/gen_ndr/ndr_netlogon_c.c - librpc/gen_ndr/ndr_samr_c.c - librpc/gen_ndr/ndr_dssetup_c.c - librpc/gen_ndr/ndr_ntsvcs_c.c - librpc/gen_ndr/ndr_epmapper_c.c - librpc/gen_ndr/ndr_drsuapi_c.c - librpc/gen_ndr/ndr_spoolss_c.c''' + ../librpc/gen_ndr/ndr_lsa_c.c + ../librpc/gen_ndr/ndr_dfs_c.c + ../librpc/gen_ndr/ndr_echo_c.c + ../librpc/gen_ndr/ndr_srvsvc_c.c + ../librpc/gen_ndr/ndr_svcctl_c.c + ../librpc/gen_ndr/ndr_winreg_c.c + ../librpc/gen_ndr/ndr_initshutdown_c.c + ../librpc/gen_ndr/ndr_eventlog_c.c + ../librpc/gen_ndr/ndr_wkssvc_c.c + ../librpc/gen_ndr/ndr_netlogon_c.c + ../librpc/gen_ndr/ndr_samr_c.c + ../librpc/gen_ndr/ndr_dssetup_c.c + ../librpc/gen_ndr/ndr_ntsvcs_c.c + ../librpc/gen_ndr/ndr_epmapper_c.c + ../librpc/gen_ndr/ndr_drsuapi_c.c + ../librpc/gen_ndr/ndr_spoolss_c.c''' LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c ../librpc/gen_ndr/cli_dfs.c @@ -330,8 +331,7 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c ../librpc/rpc/dcerpc_util.c librpc/rpc/dcerpc_helpers.c ../librpc/rpc/binding_handle.c - ${LIBNDR_GEN_SRC} - ${RPCCLIENT_NDR_SRC}''' + ${LIBNDR_GEN_SRC}''' # # registry-related objects @@ -444,8 +444,7 @@ RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c librpc/rpc/dcerpc_gssapi.c librpc/rpc/dcerpc_spnego.c rpc_client/rpc_transport_np.c - rpc_client/rpc_transport_sock.c - rpc_client/rpc_transport_smbd.c''' + rpc_client/rpc_transport_sock.c''' LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c''' @@ -781,8 +780,7 @@ PRINTBACKEND_SRC = '''printing/printing.c printing/nt_printing_tdb.c printing/nt_printing_migrate.c printing/nt_printing_ads.c - librpc/gen_ndr/ndr_ntprinting.c - ../librpc/ndr/ndr_ntprinting.c + ${LIBNDR_NTPRINTING_SRC} ${PRINTBASE_SRC}''' SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}''' -- Samba Shared Repository