From 528bcedbc55e9fa9e700db74c2f7e7323c3f08c1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 15 Jan 2011 09:17:55 +0100 Subject: s3:build: don't use librpc/gen_ndr/cli_echo.[ch] anymore metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon Jan 17 09:34:12 CET 2011 on sn-devel-104 --- source3/Makefile.in | 3 +-- source3/wscript_build | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index dd719a1766..1ebc57960f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -357,8 +357,7 @@ LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/ndr_drsuapi_c.o LIBCLI_DFS_OBJ = librpc/gen_ndr/ndr_dfs_c.o -LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \ - librpc/gen_ndr/ndr_echo_c.o +LIBCLI_ECHO_OBJ = librpc/gen_ndr/ndr_echo_c.o LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/ndr_initshutdown_c.o diff --git a/source3/wscript_build b/source3/wscript_build index 205aabee53..ef39d16574 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1079,10 +1079,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', deps='talloc', autoproto='nbtname.h') -bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO', - source='../librpc/gen_ndr/cli_echo.c', - public_deps='RPC_NDR_ECHO') - bld.SAMBA_SUBSYSTEM('RPCCLI_SAMR', source='../librpc/gen_ndr/cli_samr.c', public_deps='RPC_NDR_SAMR') @@ -1170,7 +1166,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC - LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPCCLI_ECHO + LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS @@ -1269,7 +1265,7 @@ bld.SAMBA_BINARY('nmblookup', bld.SAMBA_BINARY('smbtorture', source=SMBTORTURE_SRC, deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP - LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''', + LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''', vars=locals()) bld.SAMBA_BINARY('smbconftort', -- cgit