summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 23:41:19 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-23 22:24:06 +0000
commitbc44fcc6fb17eb9db9c9dcef08b6c88626c90819 (patch)
tree6c5a861e60d257ed112c4c4dca5b6a08dc3d3ecb /source4
parent9065f9644bd32d6ca3a8b9a77d67e0b30891a321 (diff)
downloadsamba-bc44fcc6fb17eb9db9c9dcef08b6c88626c90819.tar.gz
samba-bc44fcc6fb17eb9db9c9dcef08b6c88626c90819.tar.bz2
samba-bc44fcc6fb17eb9db9c9dcef08b6c88626c90819.zip
s4: Rename NDR_TABLE to ndr_table.
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/wmi/wscript_build2
-rwxr-xr-xsource4/librpc/wscript_build12
-rw-r--r--source4/rpc_server/wscript_build2
-rw-r--r--source4/torture/drs/wscript_build2
-rw-r--r--source4/torture/wscript_build2
5 files changed, 10 insertions, 10 deletions
diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
index 5984c23f82..5ab327f2f8 100644
--- a/source4/lib/wmi/wscript_build
+++ b/source4/lib/wmi/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('WMI',
source='wmicore.c wbemdata.c ../../../librpc/gen_ndr/dcom_p.c',
- public_deps='RPC_NDR_OXIDRESOLVER NDR_DCOM RPC_NDR_REMACT NDR_TABLE DCOM_PROXY_DCOM DCOM'
+ public_deps='RPC_NDR_OXIDRESOLVER NDR_DCOM RPC_NDR_REMACT ndr_table DCOM_PROXY_DCOM DCOM'
)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index a7d10e5ddd..4f07f91f13 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('LIBNDR',
bld.SAMBA_BINARY('ndrdump',
source='../../librpc/tools/ndrdump.c',
manpages='../../librpc/tools/ndrdump.1',
- deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA NDR_TABLE LIBSAMBA-ERRORS'
+ deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA ndr_table LIBSAMBA-ERRORS'
)
@@ -96,12 +96,12 @@ 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',
- 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 LIBSECURITY NDR_DNS''',
+ 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 LIBSECURITY NDR_DNS''',
public_deps='LIBNDR',
public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
- header_path='gen_ndr'
+ header_path='gen_ndr'
)
# create a grouping library to consolidate our samba4 specific NDR code
@@ -123,7 +123,7 @@ bld.SAMBA_LIBRARY('RPC_NDR_SAMBA4',
bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
-bld.SAMBA_LIBRARY('NDR_TABLE',
+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
NDR_DRSUAPI NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_EPMAPPER
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 4fcdcef0c6..141a69d243 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -35,7 +35,7 @@ bld.SAMBA_MODULE('dcerpc_remote',
source='remote/dcesrv_remote.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_remote_init',
- deps='LIBCLI_SMB NDR_TABLE'
+ deps='LIBCLI_SMB ndr_table'
)
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index ac0e7b8fa8..15b7361d64 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
- deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',
+ deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',
internal_module=True
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 7371965f55..48581f77af 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',
- deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
+ deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
internal_module=True
)