cleaning up conflicts between group code not yet committed and

[samba.git] / source / Makefile.in

diff --git a/source/Makefile.in b/source/Makefile.in
index 4dde76a60c360f5e3e8616a0f55132535e5c005e..5ce12efa4218bd5c3fb393a065b7145512610d25 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -110,7 +110,8 @@ RPC_SERVER_OBJ = rpc_server/srv_lsa.o \
                  rpc_server/srv_lsa_hnd.o rpc_server/srv_netlog.o \
                  rpc_server/srv_pipe_hnd.o rpc_server/srv_reg.o \
                  rpc_server/srv_samr.o rpc_server/srv_srvsvc.o \
                  rpc_server/srv_lsa_hnd.o rpc_server/srv_netlog.o \
                  rpc_server/srv_pipe_hnd.o rpc_server/srv_reg.o \
                  rpc_server/srv_samr.o rpc_server/srv_srvsvc.o \

-                 rpc_server/srv_util.o rpc_server/srv_wkssvc.o
+                 rpc_server/srv_util.o rpc_server/srv_wkssvc.o \
+               rpc_server/srv_pipe.o

 
 RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
                 rpc_parse/parse_net.o rpc_parse/parse_prs.o \
 
 RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
                 rpc_parse/parse_net.o rpc_parse/parse_prs.o \