build: rename rpcommon to dcerpc-binding an make a public library

OpenChange needs this library.

Andrew Bartlett

3 files changed, 42 insertions, 42 deletions

diff --git a/librpc/wscript_build b/librpc/wscript_build
index aba7c3fc11..444cb94671 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -358,114 +358,114 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
 	source='gen_ndr/ndr_xattr_c.c',
-	public_deps='NDR_XATTR rpccommon'
+	public_deps='NDR_XATTR dcerpc-binding'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
 	source='gen_ndr/ndr_rot_c.c',
-	public_deps='NDR_ROT rpccommon'
+	public_deps='NDR_ROT dcerpc-binding'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
 	source='gen_ndr/ndr_atsvc_c.c',
-	public_deps='rpccommon NDR_ATSVC'
+	public_deps='dcerpc-binding NDR_ATSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
 	source='gen_ndr/ndr_audiosrv_c.c',
-	public_deps='NDR_AUDIOSRV rpccommon'
+	public_deps='NDR_AUDIOSRV dcerpc-binding'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
 	source='gen_ndr/ndr_echo_c.c',
-	public_deps='rpccommon NDR_ECHO'
+	public_deps='dcerpc-binding NDR_ECHO'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
 	source='gen_ndr/ndr_dsbackup_c.c',
-	public_deps='rpccommon NDR_DSBACKUP'
+	public_deps='dcerpc-binding NDR_DSBACKUP'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
 	source='gen_ndr/ndr_efs_c.c',
-	public_deps='rpccommon NDR_EFS'
+	public_deps='dcerpc-binding NDR_EFS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
 	source='gen_ndr/ndr_lsa_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
 	source='gen_ndr/ndr_samr_c.c',
-	public_deps='rpccommon NDR_SAMR'
+	public_deps='dcerpc-binding NDR_SAMR'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
 	source='gen_ndr/ndr_dfs_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
 	source='gen_ndr/ndr_frsapi_c.c',
-	public_deps='rpccommon NDR_FRSAPI'
+	public_deps='dcerpc-binding NDR_FRSAPI'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
 	source='gen_ndr/ndr_drsuapi_c.c',
-	public_deps='rpccommon NDR_DRSUAPI'
+	public_deps='dcerpc-binding NDR_DRSUAPI'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
 	source='gen_ndr/ndr_drsblobs_c.c',
-	public_deps='rpccommon NDR_DRSBLOBS'
+	public_deps='dcerpc-binding NDR_DRSBLOBS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
 	source='gen_ndr/ndr_policyagent_c.c',
-	public_deps='rpccommon NDR_POLICYAGENT'
+	public_deps='dcerpc-binding NDR_POLICYAGENT'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
 	source='gen_ndr/ndr_unixinfo_c.c',
-	public_deps='rpccommon NDR_UNIXINFO'
+	public_deps='dcerpc-binding NDR_UNIXINFO'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
 	source='gen_ndr/ndr_browser_c.c',
-	public_deps='rpccommon NDR_BROWSER'
+	public_deps='dcerpc-binding NDR_BROWSER'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
 	source='gen_ndr/ndr_spoolss_c.c',
-	public_deps='rpccommon NDR_SPOOLSS'
+	public_deps='dcerpc-binding NDR_SPOOLSS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
 	source='gen_ndr/ndr_nbt_c.c',
-	public_deps='rpccommon NDR_NBT'
+	public_deps='dcerpc-binding NDR_NBT'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
 	source='gen_ndr/ndr_wkssvc_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
 	source='gen_ndr/ndr_srvsvc_c.c',
-	public_deps='rpccommon NDR_SRVSVC'
+	public_deps='dcerpc-binding NDR_SRVSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
 	source='gen_ndr/ndr_svcctl_c.c',
-	public_deps='rpccommon ndr-standard',
+	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='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
@@ -475,27 +475,27 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
 	source='gen_ndr/ndr_dbgidl_c.c',
-	public_deps='rpccommon NDR_DBGIDL'
+	public_deps='dcerpc-binding NDR_DBGIDL'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
 	source='gen_ndr/ndr_dssetup_c.c',
-	public_deps='rpccommon NDR_DSSETUP'
+	public_deps='dcerpc-binding NDR_DSSETUP'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
 	source='gen_ndr/ndr_msgsvc_c.c',
-	public_deps='rpccommon NDR_MSGSVC'
+	public_deps='dcerpc-binding NDR_MSGSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
 	source='gen_ndr/ndr_winreg_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
 	source='gen_ndr/ndr_initshutdown_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
@@ -505,32 +505,32 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
 	source='gen_ndr/ndr_oxidresolver_c.c',
-	public_deps='rpccommon NDR_OXIDRESOLVER'
+	public_deps='dcerpc-binding NDR_OXIDRESOLVER'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
 	source='gen_ndr/ndr_remact_c.c',
-	public_deps='rpccommon NDR_REMACT'
+	public_deps='dcerpc-binding NDR_REMACT'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
 	source='gen_ndr/ndr_wzcsvc_c.c',
-	public_deps='rpccommon NDR_WZCSVC'
+	public_deps='dcerpc-binding NDR_WZCSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
 	source='gen_ndr/ndr_w32time_c.c',
-	public_deps='rpccommon NDR_W32TIME'
+	public_deps='dcerpc-binding NDR_W32TIME'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
 	source='gen_ndr/ndr_scerpc_c.c',
-	public_deps='rpccommon NDR_SCERPC'
+	public_deps='dcerpc-binding NDR_SCERPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
 	source='gen_ndr/ndr_ntsvcs_c.c',
-	public_deps='rpccommon ndr-standard'
+	public_deps='dcerpc-binding ndr-standard'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
@@ -540,22 +540,22 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
 	source='gen_ndr/ndr_trkwks_c.c',
-	public_deps='rpccommon NDR_TRKWKS'
+	public_deps='dcerpc-binding NDR_TRKWKS'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
 	source='gen_ndr/ndr_keysvc_c.c',
-	public_deps='rpccommon NDR_KEYSVC'
+	public_deps='dcerpc-binding NDR_KEYSVC'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
 	source='gen_ndr/ndr_backupkey_c.c',
-	public_deps='rpccommon NDR_BACKUPKEY'
+	public_deps='dcerpc-binding NDR_BACKUPKEY'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSP',
 	source='gen_ndr/ndr_dnsp_c.c',
-	public_deps='rpccommon NDR_DNSP'
+	public_deps='dcerpc-binding NDR_DNSP'
 	)
 
 # a grouping library for NDR subsystems that may be used by more than one target
@@ -587,7 +587,7 @@ bld.SAMBA_LIBRARY('ndr',
 	vnum='0.0.1'
 	)
 
-bld.SAMBA_LIBRARY('rpccommon',
+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',
-                  private_library=True)
+                  vnum='0.0.1')
diff --git a/source3/wscript_build b/source3/wscript_build
index 0a93999ad5..36e8c5068c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -699,7 +699,7 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    source='${LIBMSRPC_SRC}',
                    deps='''ndr ndr-standard
                     RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
-                    LIBTSOCKET KRB5_WRAP rpccommon
+                    LIBTSOCKET KRB5_WRAP dcerpc-binding
                     libsmb''',
                    vars=locals(),
                    private_library=True)
@@ -812,7 +812,7 @@ bld.SAMBA3_LIBRARY('smbd_shim',
 
 bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
                     source='',
-                    deps='errors3 pdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
+                    deps='errors3 pdb ldap lber MSRPC_PARSE LIBCLI_AUTH dcerpc-binding',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 35b0d4dca5..e695c4e4c1 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 	rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
 	rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
 	pc_files='dcerpc.pc',
-	deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util rpccommon',
+	deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util dcerpc-binding',
 	autoproto='rpc/dcerpc_proto.h',
 	public_deps='credentials tevent talloc',
 	public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h