-RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
- ${SCHANNEL_SRC}'''
-
-LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
- ${RPC_CLIENT_SRC1}
- ${RPC_CLIENT_SRC}
- rpc_client/init_samr.c
- ../librpc/rpc/binding.c'''
-
-DCERPC_CLIENT_GEN_SRC = '''
- ../librpc/gen_ndr/ndr_lsa_c.c
- ../librpc/gen_ndr/ndr_srvsvc_c.c
- ../librpc/gen_ndr/ndr_svcctl_c.c
- ../librpc/gen_ndr/ndr_wkssvc_c.c
- ../librpc/gen_ndr/ndr_netlogon_c.c
- ../librpc/gen_ndr/ndr_samr_c.c
- ../librpc/gen_ndr/ndr_epmapper_c.c'''
-
-LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
- ../librpc/gen_ndr/cli_srvsvc.c
- ../librpc/gen_ndr/cli_svcctl.c
- ../librpc/gen_ndr/cli_wkssvc.c
- ../librpc/gen_ndr/cli_netlogon.c
- ../librpc/gen_ndr/cli_samr.c
- ../librpc/gen_ndr/cli_epmapper.c
- ${DCERPC_CLIENT_GEN_SRC}
- ../librpc/rpc/dcerpc_util.c
- librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
+LIBMSRPC_SRC = '''
+ ${SCHANNEL_SRC}
+ rpc_client/cli_pipe.c
+ librpc/rpc/rpc_common.c
+ librpc/rpc/dcerpc_gssapi.c
+ librpc/rpc/dcerpc_krb5.c
+ librpc/rpc/dcerpc_spnego.c
+ rpc_client/rpc_transport_np.c
+ rpc_client/rpc_transport_sock.c
+ ../librpc/rpc/binding.c
+ ../librpc/rpc/dcerpc_util.c
+ librpc/rpc/dcerpc_helpers.c
+ ../librpc/rpc/binding_handle.c'''
+
+LIBMSRPC_GEN_SRC = '''
+ ${LIBCLI_EPMAPPER_SRC}