summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--librpc/wscript_build28
-rw-r--r--source3/wscript_build2
-rwxr-xr-xsource4/librpc/wscript_build12
-rw-r--r--source4/rpc_server/wscript_build12
4 files changed, 27 insertions, 27 deletions
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 2ff4c3e58f..a201b01d38 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -179,12 +179,12 @@ bld.SAMBA_SUBSYSTEM('NDR_RAP',
bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
source='../librpc/gen_ndr/ndr_idmap.c',
- public_deps='ndr NDR_STANDARD'
+ public_deps='ndr ndr-standard'
)
bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
source='../librpc/ndr/ndr_ntlmssp.c ../librpc/gen_ndr/ndr_ntlmssp.c',
- public_deps='ndr NDR_STANDARD'
+ public_deps='ndr ndr-standard'
)
bld.SAMBA_SUBSYSTEM('NDR_DNSP',
@@ -255,7 +255,7 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
source='../librpc/ndr/ndr_drsuapi.c ../librpc/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 ASN1_UTIL'
)
bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
@@ -265,7 +265,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
source='../librpc/ndr/ndr_krb5pac.c ../librpc/gen_ndr/ndr_krb5pac.c',
- public_deps='ndr NDR_STANDARD NDR_SECURITY'
+ public_deps='ndr ndr-standard NDR_SECURITY'
)
@@ -281,7 +281,7 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
bld.SAMBA_SUBSYSTEM('NDR_NBT',
source='../librpc/gen_ndr/ndr_nbt.c',
- public_deps='ndr NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
+ public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard LIBCLI_NDR_NETLOGON',
public_headers='../librpc/gen_ndr/nbt.h',
header_path='gen_ndr'
)
@@ -318,7 +318,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
source='../librpc/gen_ndr/ndr_lsa_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
@@ -328,7 +328,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
source='../librpc/gen_ndr/ndr_dfs_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
@@ -373,7 +373,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
source='../librpc/gen_ndr/ndr_wkssvc_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
@@ -383,14 +383,14 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
source='../librpc/gen_ndr/ndr_svcctl_c.c',
- public_deps='dcerpc NDR_STANDARD',
+ public_deps='dcerpc ndr-standard',
public_headers='../librpc/gen_ndr/ndr_svcctl_c.h',
header_path='gen_ndr'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
source='../librpc/gen_ndr/ndr_eventlog_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
@@ -415,12 +415,12 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
source='../librpc/gen_ndr/ndr_winreg_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
source='../librpc/gen_ndr/ndr_initshutdown_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
@@ -460,12 +460,12 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
source='../librpc/gen_ndr/ndr_ntsvcs_c.c',
- public_deps='dcerpc NDR_STANDARD'
+ public_deps='dcerpc ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
source='../librpc/gen_ndr/ndr_netlogon_c.c',
- public_deps='NDR_STANDARD tevent'
+ public_deps='ndr-standard tevent'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
diff --git a/source3/wscript_build b/source3/wscript_build
index 84d30f8fe7..a151583eb0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1163,7 +1163,7 @@ bld.SAMBA_SUBSYSTEM('ndr',
vars=locals())
#FIXME
-bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
+bld.SAMBA_SUBSYSTEM('ndr-standard',
source='',
deps='''
NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 261633ba89..f46981b952 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -88,11 +88,11 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
source='gen_ndr/ndr_winbind.c',
- public_deps='NDR_IDMAP ndr NDR_STANDARD'
+ public_deps='NDR_IDMAP ndr ndr-standard'
)
-bld.SAMBA_LIBRARY('NDR_STANDARD',
+bld.SAMBA_LIBRARY('ndr-standard',
source='../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_eventlog6.c',
vnum='0.0.1',
pc_files='../../librpc/ndr_standard.pc',
@@ -125,7 +125,7 @@ bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
bld.SAMBA_LIBRARY('ndr_table',
source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c',
- public_deps='''NDR_STANDARD NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS
+ public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS
NDR_DRSUAPI NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_EPMAPPER
NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF NDR_MGMT
NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
@@ -156,14 +156,14 @@ bld.SAMBA_LIBRARY('dcerpc_samr',
source='../../librpc/gen_ndr/ndr_samr_c.c',
pc_files='dcerpc_samr.pc',
vnum='0.0.1',
- public_deps='dcerpc NDR_STANDARD',
+ public_deps='dcerpc ndr-standard',
public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
header_path='gen_ndr'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DNS',
source='../../librpc/gen_ndr/ndr_dns_c.c',
- public_deps='dcerpc NDR_STANDARD',
+ public_deps='dcerpc ndr-standard',
)
@@ -171,7 +171,7 @@ bld.SAMBA_LIBRARY('dcerpc_atsvc',
source='../../librpc/gen_ndr/ndr_atsvc_c.c',
pc_files='dcerpc_atsvc.pc',
vnum='0.0.1',
- public_deps='dcerpc NDR_STANDARD',
+ public_deps='dcerpc ndr-standard',
public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
header_path='gen_ndr'
)
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 86265f2e55..5eb77b7524 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('dcerpc_rpcecho',
source='echo/rpc_echo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_rpcecho_init',
- deps='NDR_STANDARD events'
+ deps='ndr-standard events'
)
@@ -52,7 +52,7 @@ bld.SAMBA_MODULE('dcerpc_wkssvc',
source='wkssvc/dcesrv_wkssvc.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_wkssvc_init',
- deps='DCERPC_COMMON NDR_STANDARD'
+ deps='DCERPC_COMMON ndr-standard'
)
@@ -69,7 +69,7 @@ bld.SAMBA_MODULE('dcesrv_samr',
autoproto='samr/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_samr_init',
- deps='SAMDB DCERPC_COMMON NDR_STANDARD'
+ deps='SAMDB DCERPC_COMMON ndr-standard'
)
@@ -77,7 +77,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
source='winreg/rpc_winreg.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_winreg_init',
- deps='registry NDR_STANDARD security_session',
+ deps='registry ndr-standard security_session',
internal_module=True
)
@@ -86,7 +86,7 @@ bld.SAMBA_MODULE('dcerpc_netlogon',
source='netlogon/dcerpc_netlogon.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_netlogon_init',
- deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB NDR_STANDARD auth_sam samba-hostconfig CLDAPD'
+ deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB ndr-standard auth_sam samba-hostconfig CLDAPD'
)
@@ -95,7 +95,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
autoproto='lsa/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_lsa_init',
- deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP com_err security_session'
+ deps='SAMDB DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security_session'
)
generated by cgit (git 2.34.1) at 2024-11-22 09:20:28 +0000