s3-build: use LIBMSRPC_OBJ instead of single files.

Guenther

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4b3efc26e5e9876c33c37e71c74cc9a0d3e6610a..9f25f4c738c12c000303f5e75cbf167d0fc8d370 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -959,10 +959,9 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
             $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-             $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o \
-             $(RPC_CLIENT_OBJ1) \
             $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
             $(LIBMSRPC_GEN_OBJ) \
+            $(LIBMSRPC_OBJ) \
             $(LIBCLI_SRVSVC_OBJ)
 
 TESTPARM_OBJ = utils/testparm.o \
@@ -1069,10 +1068,9 @@ LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
        $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(PASSDB_OBJ) \
        $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
 
-CLIENT_OBJ1 = client/client.o client/clitar.o $(RPC_CLIENT_OBJ) \
-             ../librpc/rpc/binding.o \
+CLIENT_OBJ1 = client/client.o client/clitar.o \
              client/dnsbrowse.o \
-             $(RPC_CLIENT_OBJ1)
+             $(LIBMSRPC_OBJ)
 
 CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
             $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1446,12 +1444,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
                   $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
                   $(LIB_NONSMBD_OBJ) \
                   $(KRBCLIENT_OBJ) \
-                  $(RPC_CLIENT_OBJ1) \
-                  librpc/rpc/rpc_common.o \
-                  rpc_client/cli_pipe.o \
-                  librpc/rpc/dcerpc_gssapi.o \
-                  librpc/rpc/dcerpc_spnego.o \
-                  ../librpc/rpc/binding.o \
+                  $(LIBMSRPC_OBJ) \
                   $(LIBMSRPC_GEN_OBJ)
 
 DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \