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)interval_tree.o
-ldlm_objs += $(LDLM)ldlm_reclaim.o
+ldlm_objs += $(LDLM)ldlm_pool.o $(LDLM)ldlm_reclaim.o
target_objs := $(TARGET)tgt_main.o $(TARGET)tgt_lastrcvd.o
target_objs += $(TARGET)tgt_handler.o $(TARGET)out_handler.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_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
+ptlrpc_objs += sec_null.o sec_plain.o nrs.o nrs_fifo.o nrs_delay.o heap.o
+ptlrpc_objs += errno.o
+
+nrs_server_objs := nrs_crr.o nrs_orr.o nrs_tbf.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) $(TARGET)barrier.o
-@SERVER_TRUE@ptlrpc-objs += $(target_objs) $(nodemap_objs)
+@SERVER_TRUE@ptlrpc-objs += $(target_objs) $(nodemap_objs) $(nrs_server_objs) pack_server.o
-@GSS_TRUE@subdir-m += gss
+@GSS_TRUE@obj-m += gss/
default: all
l_lock.c: @LUSTRE@/ldlm/l_lock.c
ln -sf $< $@
-interval_tree.c: @LUSTRE@/ldlm/interval_tree.c
- ln -sf $< $@
-
tgt_%.c: @LUSTRE@/target/tgt_%.c
ln -sf $< $@
ln -sf $< $@
EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
-EXTRA_DIST += $(nodemap_objs:.o=.c) nodemap_internal.h
+EXTRA_DIST += $(nodemap_objs:.o=.c) nodemap_internal.h heap.h
+EXTRA_DIST += $(nrs_server_objs:.o=.c)
+EXTRA_DIST += pack_server.c
EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target