s3-build: only link in samr util code where needed.

Guenther

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 34e2a6ab2f4a26fa1f20f8c29d71d5cee94cd424..4b3efc26e5e9876c33c37e71c74cc9a0d3e6610a 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -600,7 +600,6 @@ RPC_CLIENT_OBJ1 = $(SCHANNEL_OBJ)
 LIBMSRPC_OBJ = \
               $(RPC_CLIENT_OBJ1) \
               $(RPC_CLIENT_OBJ) \
-              rpc_client/init_samr.o \
                   ../librpc/rpc/binding.o
 
 LIBMSRPC_GEN_OBJ = $(LIBCLI_EPMAPPER_OBJ) \
@@ -718,7 +717,8 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
                 $(LIBCLI_SAMR_OBJ) \
                 $(LIBCLI_NETLOGON_OBJ) \
                 $(RPC_CLIENT_SCHANNEL_OBJ) \
-                rpc_client/init_netlogon.o
+                rpc_client/init_netlogon.o \
+                rpc_client/init_samr.o
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
                 librpc/rpc/dcerpc_gssapi.o \
@@ -1025,7 +1025,8 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
             $(LIBCLI_SAMR_OBJ) \
             $(LIBCLI_NETLOGON_OBJ) \
             $(RPC_CLIENT_SCHANNEL_OBJ) \
-            rpc_client/init_netlogon.o
+            rpc_client/init_netlogon.o \
+            rpc_client/init_samr.o
 
 PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
                  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1139,7 +1140,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           $(LIBCLI_SAMR_OBJ) \
           $(LIBCLI_NETLOGON_OBJ) \
           $(RPC_CLIENT_SCHANNEL_OBJ) \
-          rpc_client/init_netlogon.o
+          rpc_client/init_netlogon.o \
+          rpc_client/init_samr.o
 
 
 # these are not processed by make proto
@@ -1390,7 +1392,8 @@ WINBINDD_OBJ = \
                $(LIBCLI_LSA_OBJ) \
                $(LIBCLI_SAMR_OBJ) \
                $(LIBCLI_NETLOGON_OBJ) \
-               rpc_client/init_netlogon.o
+               rpc_client/init_netlogon.o \
+               rpc_client/init_samr.o
 
 WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
                $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -2313,7 +2316,8 @@ LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
                 $(LIBCLI_SAMR_OBJ) \
                 $(LIBCLI_NETLOGON_OBJ) \
                 $(RPC_CLIENT_SCHANNEL_OBJ) \
-                rpc_client/init_netlogon.o
+                rpc_client/init_netlogon.o \
+                rpc_client/init_samr.o
 
 LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
 LIBNETAPI_SOVER=@LIBNETAPI_SOVER@