s3:build: don't use cli_dssetup.c any more

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jan  4 22:21:48 CET 2011 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 25bbe2cae0267da699fbbf7c3bf56a1fe4e5cb94..cfcadce4cf0bd579a15ef0f7472f32860ff5cf0a 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -363,8 +363,7 @@ LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
 LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \
                          librpc/gen_ndr/ndr_initshutdown_c.o
 
-LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \
-                    librpc/gen_ndr/ndr_dssetup_c.o
+LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/ndr_dssetup_c.o
 
 LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/cli_svcctl.o \
                    librpc/gen_ndr/ndr_svcctl_c.o

diff --git a/source3/wscript_build b/source3/wscript_build
index a8651dd16cd4bbc4fdb0be6fa7e6f3104f029c83..af7c6cbea0a502944766158b7252194b30b2023a 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1137,10 +1137,6 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
        source='../librpc/gen_ndr/cli_svcctl.c',
        public_deps='RPC_NDR_SVCCTL')
 
-bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
-       source='../librpc/gen_ndr/cli_dssetup.c',
-       public_deps='RPC_NDR_DSSETUP')
-
 bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
        source='../librpc/gen_ndr/cli_dfs.c',
        public_deps='RPC_NDR_DFS')
@@ -1211,7 +1207,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                 RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+                 RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
                  RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
                  ''',
                  enabled=bld.env.build_winbind,
@@ -1235,7 +1231,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
                  RPC_CLIENT_SCHANNEL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
+                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPC_NDR_DSSETUP RPCCLI_DFS
                  RPCCLI_DRSUAPI RPC_NDR_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
                  INIT_SAMR
                  ''',
@@ -1257,7 +1253,7 @@ bld.SAMBA_BINARY('net',
                  REGFIO NDR_NTPRINTING RPCCLI_WINREG
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
                  LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
+                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPC_NDR_DSSETUP
                  RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR
                 ''',
                  vars=locals())