X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FMakefile.in;h=a02ecb5540d45afb02bb02b3257a3ac73cfec243;hb=5d085745af43bd15e6b7ea728491600411833b2a;hp=aee4786fc54bf6cb8780e620357095795697df8f;hpb=b26f39067bd87ad8a9840e03acbf75f3a47f6352;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index aee4786..a02ecb5 100644
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,21 +1,35 @@
 MODULES := ptlrpc
 LDLM := @top_srcdir@/lustre/ldlm/
+TARGET := @top_srcdir@/lustre/target/
 
-ldlm_objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
+ldlm_objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o
 ldlm_objs += $(LDLM)ldlm_resource.o $(LDLM)ldlm_lib.o
 ldlm_objs += $(LDLM)ldlm_plain.o $(LDLM)ldlm_extent.o
 ldlm_objs += $(LDLM)ldlm_request.o $(LDLM)ldlm_lockd.o
 ldlm_objs += $(LDLM)ldlm_flock.o $(LDLM)ldlm_inodebits.o
-ldlm_objs += $(LDLM)ldlm_pool.o
-ldlm_objs += $(LDLM)interval_tree.o
+ldlm_objs += $(LDLM)ldlm_pool.o $(LDLM)interval_tree.o
+ldlm_objs += $(LDLM)ldlm_reclaim.o
+
+target_objs := $(TARGET)tgt_main.o $(TARGET)tgt_lastrcvd.o
+target_objs += $(TARGET)tgt_handler.o $(TARGET)out_handler.o
+target_objs += $(TARGET)out_lib.o $(TARGET)update_trans.o
+target_objs += $(TARGET)update_records.o $(TARGET)update_recovery.o
+target_objs += $(TARGET)tgt_grant.o $(TARGET)tgt_fmd.o
+
 ptlrpc_objs := client.o recover.o connection.o niobuf.o pack_generic.o
-ptlrpc_objs += events.o ptlrpc_module.o service.o pinger.o recov_thread.o
+ptlrpc_objs += events.o ptlrpc_module.o service.o pinger.o
 ptlrpc_objs += llog_net.o llog_client.o llog_server.o import.o ptlrpcd.o
 ptlrpc_objs += pers.o lproc_ptlrpc.o wiretest.o layout.o
-ptlrpc_objs += sec.o sec_bulk.o sec_gc.o sec_config.o sec_lproc.o
-ptlrpc_objs += sec_null.o sec_plain.o
+ptlrpc_objs += sec.o sec_ctx.o sec_bulk.o sec_gc.o sec_config.o sec_lproc.o
+ptlrpc_objs += sec_null.o sec_plain.o nrs.o nrs_fifo.o nrs_crr.o nrs_orr.o
+ptlrpc_objs += nrs_tbf.o nrs_delay.o errno.o
+
+nodemap_objs := nodemap_handler.o nodemap_lproc.o nodemap_range.o
+nodemap_objs += nodemap_idmap.o nodemap_rbtree.o nodemap_member.o
+nodemap_objs += nodemap_storage.o
 
-ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
+ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs) $(TARGET)barrier.o
+@SERVER_TRUE@ptlrpc-objs += $(target_objs) $(nodemap_objs)
 
 @GSS_TRUE@subdir-m += gss
 
@@ -30,6 +44,18 @@ l_lock.c: @LUSTRE@/ldlm/l_lock.c
 interval_tree.c: @LUSTRE@/ldlm/interval_tree.c
 	ln -sf $< $@
 
-EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
+tgt_%.c: @LUSTRE@/target/tgt_%.c
+	ln -sf $< $@
+
+out_%.c: @LUSTRE@/target/out_%.c
+	ln -sf $< $@
+
+barrier.c: @LUSTRE@/target/barrier.c
+	ln -sf $< $@
+
+EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
+EXTRA_DIST += $(nodemap_objs:.o=.c) nodemap_internal.h
+
+EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target
 
 @INCLUDE_RULES@