summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-26 00:13:55 +0200
committerGünther Deschner <gd@samba.org>2010-08-26 00:17:10 +0200
commitc5ffecb136225dba294327cc3a437e5f17475253 (patch)
tree70c53728a4b80906e8006f559b2e3bb2750f906a
parent6a795dd14674bfa2f6fe5206a9237f867c48e875 (diff)
downloadsamba-c5ffecb136225dba294327cc3a437e5f17475253.tar.gz
samba-c5ffecb136225dba294327cc3a437e5f17475253.tar.bz2
samba-c5ffecb136225dba294327cc3a437e5f17475253.zip
s3-build: further rationalise LIBMSRPC_OBJ and remove RPC_CLIENT_OBJ.
Guenther
-rw-r--r--source3/Makefile.in22
1 files changed, 10 insertions, 12 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c8e4e53904..04c62d30f8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -596,13 +596,18 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
$(DRSUAPI_OBJ)
LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
- $(RPC_CLIENT_OBJ) \
- ../librpc/rpc/binding.o
+ rpc_client/cli_pipe.o \
+ librpc/rpc/dcerpc_gssapi.o \
+ librpc/rpc/dcerpc_spnego.o \
+ librpc/rpc/rpc_common.o \
+ rpc_client/rpc_transport_np.o \
+ rpc_client/rpc_transport_sock.o \
+ ../librpc/rpc/binding.o \
+ ../librpc/rpc/dcerpc_util.o \
+ ../librpc/rpc/binding_handle.o \
+ librpc/rpc/dcerpc_helpers.o
LIBMSRPC_GEN_OBJ = $(LIBCLI_EPMAPPER_OBJ) \
- ../librpc/rpc/dcerpc_util.o \
- ../librpc/rpc/binding_handle.o \
- librpc/rpc/dcerpc_helpers.o \
$(LIBNDR_GEN_OBJ)
#
@@ -717,13 +722,6 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
rpc_client/init_netlogon.o \
rpc_client/init_samr.o
-RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
- librpc/rpc/dcerpc_gssapi.o \
- librpc/rpc/dcerpc_spnego.o \
- librpc/rpc/rpc_common.o \
- rpc_client/rpc_transport_np.o \
- rpc_client/rpc_transport_sock.o
-
RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o