X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=librpc%2Fwscript_build;h=540050edb90352c0451b63b012513e9557673349;hb=22a2c46f844f8c0897bc3d3ef2f613bfc885873a;hp=abbda8cfe3f85a3246f334efad7e5638b230c6b4;hpb=cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf;p=samba.git

diff --git a/librpc/wscript_build b/librpc/wscript_build
index abbda8cfe3f..540050edb90 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -9,19 +9,24 @@ bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_AUTH',
-                    source='gen_ndr/ndr_auth.c',
+                    source='gen_ndr/ndr_auth.c ndr/ndr_auth.c',
                     public_headers='gen_ndr/auth.h',
                     header_path='gen_ndr',
                     public_deps='ndr NDR_SECURITY ndr-krb5pac'
                     )
 
+bld.SAMBA_SUBSYSTEM('NDR_ATSVC',
+	source='gen_ndr/ndr_atsvc.c',
+	public_deps='ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
 	source='gen_ndr/ndr_named_pipe_auth.c',
 	public_deps='ndr NDR_AUTH'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
-	source='gen_ndr/ndr_dnsserver.c',
+	source='gen_ndr/ndr_dnsserver.c ndr/ndr_dnsserver.c',
 	public_deps='ndr'
 	)
 
@@ -95,6 +100,11 @@ bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
         deps='talloc'
 	)
 
+bld.SAMBA_SUBSYSTEM('NDR_PRINTCAP',
+	source='gen_ndr/ndr_printcap.c',
+	public_deps='ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
 	source='gen_ndr/ndr_epmapper.c',
 	public_deps='ndr'
@@ -165,6 +175,13 @@ bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
 	public_deps='ndr'
 	)
 
+bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
+	source='gen_ndr/ndr_server_id.c',
+	deps='ndr',
+	public_headers='gen_ndr/server_id.h',
+	header_path='gen_ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
 	source='gen_ndr/ndr_trkwks.c',
 	public_deps='ndr'
@@ -185,6 +202,11 @@ bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
 	public_deps='ndr ndr-standard'
 	)
 
+bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
+	source='gen_ndr/ndr_notify.c',
+	public_deps='ndr ndr-standard NDR_SERVER_ID NDR_FILE_ID'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
 	source='ndr/ndr_ntlmssp.c gen_ndr/ndr_ntlmssp.c',
 	public_deps='ndr ndr-standard'
@@ -229,7 +251,7 @@ bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
 
 bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
 	source='gen_ndr/ndr_netlogon.c ndr/ndr_netlogon.c',
-	public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
+	public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR ndr_nbt'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
@@ -272,12 +294,16 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
 	source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c',
-	public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard ASN1_UTIL'
+	public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard asn1util',
+	public_headers='gen_ndr/ndr_drsuapi.h gen_ndr/drsuapi.h ndr/ndr_drsuapi.h',
+	header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
 	source='ndr/ndr_drsblobs.c gen_ndr/ndr_drsblobs.c',
-	public_deps='ndr NDR_DRSUAPI'
+	public_deps='ndr NDR_DRSUAPI',
+	public_headers='gen_ndr/ndr_drsblobs.h gen_ndr/drsblobs.h ndr/ndr_drsblobs.h',
+	header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
 	)
 
 bld.SAMBA_LIBRARY('ndr-krb5pac',
@@ -290,12 +316,13 @@ bld.SAMBA_LIBRARY('ndr-krb5pac',
                     )
 
 bld.SAMBA_LIBRARY('ndr-standard',
-	source='gen_ndr/ndr_atsvc.c gen_ndr/ndr_eventlog6.c',
+	source='gen_ndr/ndr_eventlog6.c',
 	vnum='0.0.1',
 	pc_files='ndr_standard.pc',
 	deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
 	NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
-	NDR_ECHO security NDR_DNS''',
+	NDR_ECHO security NDR_DNS NDR_ATSVC NDR_SPOOLSS NDR_DSSETUP
+        NDR_SERVER_ID NDR_NOTIFY''',
 	public_deps='ndr',
 	public_headers='gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/lsa.h gen_ndr/netlogon.h gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h',
 	header_path='gen_ndr'
@@ -308,14 +335,16 @@ bld.SAMBA_SUBSYSTEM('NDR_XATTR',
 
 bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 	source='ndr/ndr_schannel.c gen_ndr/ndr_schannel.c',
-	public_deps='ndr NDR_NBT'
+	public_deps='ndr ndr_nbt'
 	)
 
-bld.SAMBA_SUBSYSTEM('NDR_NBT',
-	source='gen_ndr/ndr_nbt.c',
-	public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard LIBCLI_NDR_NETLOGON',
-	public_headers='gen_ndr/nbt.h',
-        header_path='gen_ndr'
+bld.SAMBA_LIBRARY('ndr_nbt',
+	source='gen_ndr/ndr_nbt.c ndr/ndr_nbt.c',
+	public_deps='ndr NDR_NBT_BUF NDR_SECURITY',
+	public_headers='gen_ndr/nbt.h gen_ndr/ndr_nbt.h ndr/ndr_nbt.h',
+        header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')],
+        pc_files='ndr_nbt.pc',
+        vnum='0.0.1'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
@@ -335,109 +364,119 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
 	source='gen_ndr/ndr_xattr_c.c',
-	public_deps='NDR_XATTR dcerpc'
+	public_deps='NDR_XATTR dcerpc-binding'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
 	source='gen_ndr/ndr_rot_c.c',
-	public_deps='NDR_ROT dcerpc'
+	public_deps='NDR_ROT dcerpc-binding'
+	)
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
+	source='gen_ndr/ndr_atsvc_c.c',
+	public_deps='dcerpc-binding NDR_ATSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
 	source='gen_ndr/ndr_audiosrv_c.c',
-	public_deps='NDR_AUDIOSRV dcerpc'
+	public_deps='NDR_AUDIOSRV dcerpc-binding'
+	)
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DNS',
+	source='gen_ndr/ndr_dns_c.c',
+	public_deps='dcerpc-binding NDR_DNS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
 	source='gen_ndr/ndr_echo_c.c',
-	public_deps='dcerpc NDR_ECHO'
+	public_deps='dcerpc-binding NDR_ECHO'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
 	source='gen_ndr/ndr_dsbackup_c.c',
-	public_deps='dcerpc NDR_DSBACKUP'
+	public_deps='dcerpc-binding NDR_DSBACKUP'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
 	source='gen_ndr/ndr_efs_c.c',
-	public_deps='dcerpc NDR_EFS'
+	public_deps='dcerpc-binding NDR_EFS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
 	source='gen_ndr/ndr_lsa_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
 	source='gen_ndr/ndr_samr_c.c',
-	public_deps='dcerpc NDR_SAMR'
+	public_deps='dcerpc-binding NDR_SAMR'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
 	source='gen_ndr/ndr_dfs_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
 	source='gen_ndr/ndr_frsapi_c.c',
-	public_deps='dcerpc NDR_FRSAPI'
+	public_deps='dcerpc-binding NDR_FRSAPI'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
 	source='gen_ndr/ndr_drsuapi_c.c',
-	public_deps='dcerpc NDR_DRSUAPI'
+	public_deps='dcerpc-binding NDR_DRSUAPI'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
 	source='gen_ndr/ndr_drsblobs_c.c',
-	public_deps='dcerpc NDR_DRSBLOBS'
+	public_deps='dcerpc-binding NDR_DRSBLOBS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
 	source='gen_ndr/ndr_policyagent_c.c',
-	public_deps='dcerpc NDR_POLICYAGENT'
+	public_deps='dcerpc-binding NDR_POLICYAGENT'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
 	source='gen_ndr/ndr_unixinfo_c.c',
-	public_deps='dcerpc NDR_UNIXINFO'
+	public_deps='dcerpc-binding NDR_UNIXINFO'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
 	source='gen_ndr/ndr_browser_c.c',
-	public_deps='dcerpc NDR_BROWSER'
+	public_deps='dcerpc-binding NDR_BROWSER'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
 	source='gen_ndr/ndr_spoolss_c.c',
-	public_deps='dcerpc NDR_SPOOLSS'
+	public_deps='dcerpc-binding NDR_SPOOLSS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
 	source='gen_ndr/ndr_nbt_c.c',
-	public_deps='dcerpc NDR_NBT'
+	public_deps='dcerpc-binding ndr_nbt'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
 	source='gen_ndr/ndr_wkssvc_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
 	source='gen_ndr/ndr_srvsvc_c.c',
-	public_deps='dcerpc NDR_SRVSVC'
+	public_deps='dcerpc-binding NDR_SRVSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
 	source='gen_ndr/ndr_svcctl_c.c',
-	public_deps='dcerpc ndr-standard',
-	public_headers='gen_ndr/ndr_svcctl_c.h',
-        header_path='gen_ndr'
+	public_deps='dcerpc-binding ndr-standard',
+	public_headers='gen_ndr/ndr_svcctl_c.h ndr/ndr_svcctl.h',
+        header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
 	source='gen_ndr/ndr_eventlog_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
@@ -447,27 +486,27 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
 	source='gen_ndr/ndr_dbgidl_c.c',
-	public_deps='dcerpc NDR_DBGIDL'
+	public_deps='dcerpc-binding NDR_DBGIDL'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
 	source='gen_ndr/ndr_dssetup_c.c',
-	public_deps='dcerpc NDR_DSSETUP'
+	public_deps='dcerpc-binding NDR_DSSETUP'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
 	source='gen_ndr/ndr_msgsvc_c.c',
-	public_deps='dcerpc NDR_MSGSVC'
+	public_deps='dcerpc-binding NDR_MSGSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
 	source='gen_ndr/ndr_winreg_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
 	source='gen_ndr/ndr_initshutdown_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
@@ -477,32 +516,32 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
 	source='gen_ndr/ndr_oxidresolver_c.c',
-	public_deps='dcerpc NDR_OXIDRESOLVER'
+	public_deps='dcerpc-binding NDR_OXIDRESOLVER'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
 	source='gen_ndr/ndr_remact_c.c',
-	public_deps='dcerpc NDR_REMACT'
+	public_deps='dcerpc-binding NDR_REMACT'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
 	source='gen_ndr/ndr_wzcsvc_c.c',
-	public_deps='dcerpc NDR_WZCSVC'
+	public_deps='dcerpc-binding NDR_WZCSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
 	source='gen_ndr/ndr_w32time_c.c',
-	public_deps='dcerpc NDR_W32TIME'
+	public_deps='dcerpc-binding NDR_W32TIME'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
 	source='gen_ndr/ndr_scerpc_c.c',
-	public_deps='dcerpc NDR_SCERPC'
+	public_deps='dcerpc-binding NDR_SCERPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
 	source='gen_ndr/ndr_ntsvcs_c.c',
-	public_deps='dcerpc ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
@@ -512,42 +551,55 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
 	source='gen_ndr/ndr_trkwks_c.c',
-	public_deps='dcerpc NDR_TRKWKS'
+	public_deps='dcerpc-binding NDR_TRKWKS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
 	source='gen_ndr/ndr_keysvc_c.c',
-	public_deps='dcerpc NDR_KEYSVC'
+	public_deps='dcerpc-binding NDR_KEYSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
 	source='gen_ndr/ndr_backupkey_c.c',
-	public_deps='dcerpc NDR_BACKUPKEY'
+	public_deps='dcerpc-binding NDR_BACKUPKEY'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSP',
 	source='gen_ndr/ndr_dnsp_c.c',
-	public_deps='dcerpc NDR_DNSP'
+	public_deps='dcerpc-binding NDR_DNSP'
+	)
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSSERVER',
+	source='gen_ndr/ndr_dnsserver_c.c',
+	public_deps='dcerpc-binding ndr-standard'
+	)
+
+bld.SAMBA_SUBSYSTEM('NDR_IOCTL',
+	source='gen_ndr/ndr_ioctl.c',
+	public_deps='ndr'
 	)
 
 # a grouping library for NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('ndr-samba',
 	source=[],
-	deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM',
+	deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM NDR_NTPRINTING',
 	private_library=True,
 	grouping_library=True
 	)
 
 # a grouping library for RPC_NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('dcerpc-samba',
-	source=[],
-	deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINREG',
-	private_library=True,
-	grouping_library=True
-	)
+                  source='',
+                  deps='''RPC_NDR_LSA RPC_NDR_SAMR RPC_NDR_NETLOGON RPC_NDR_EVENTLOG RPC_NDR_DFS
+	          RPC_NDR_NTSVCS RPC_NDR_SVCCTL RPC_NDR_INITSHUTDOWN RPC_NDR_WKSSVC RPC_NDR_SRVSVC RPC_NDR_WINREG
+	          RPC_NDR_ECHO RPC_NDR_EPMAPPER RPC_NDR_ATSVC RPC_NDR_SPOOLSS RPC_NDR_DNS''',
+                  public_deps='ndr-standard',
+                  private_library=True,
+                  grouping_library=True
+                  )
 
 bld.SAMBA_LIBRARY('ndr',
-	source='ndr/ndr_string.c ndr/ndr_basic.c ndr/uuid.c ndr/ndr.c ndr/ndr_misc.c gen_ndr/ndr_misc.c',
+	source='ndr/ndr_string.c ndr/ndr_basic.c ndr/uuid.c ndr/ndr.c ndr/ndr_misc.c gen_ndr/ndr_misc.c ndr/util.c',
 	pc_files='ndr.pc',
 	public_deps='errors talloc samba-util',
 	public_headers='gen_ndr/misc.h gen_ndr/ndr_misc.h ndr/libndr.h:ndr.h',
@@ -555,3 +607,10 @@ bld.SAMBA_LIBRARY('ndr',
 	depends_on='PIDL_MISC',
 	vnum='0.0.1'
 	)
+
+bld.SAMBA_LIBRARY('dcerpc-binding',
+	  source='rpc/dcerpc_error.c rpc/binding.c rpc/dcerpc_util.c rpc/binding_handle.c',
+	  deps='ndr tevent NDR_DCERPC LIBTSOCKET tevent-util',
+	  pc_files=[],
+	  public_headers='rpc/rpc_common.h',
+	  vnum='0.0.1')