X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FMakefile.in;h=9a2e0cad349f3323dbcd8985e61c439df3380e5d;hb=d800fc41a1abdaf7aaf6c0e3e7ddcdec489985a8;hp=d5d8e18e04462e74df5c8d86705904f7877abf41;hpb=8a41cc258a4cf12f779b82c32d98e9696aa49833;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index d5d8e18..9a2e0ca 100644
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,19 +1,21 @@
 MODULES := ptlrpc
-ifeq ($(PATCHLEVEL),6)
 LDLM := @top_srcdir@/lustre/ldlm/
-else
-LDLM :=
-endif
+
 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
 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 += 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_null.o sec_plain.o sec_lproc.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
+
+@SERVER_TRUE@ptlrpc_objs += target.o
 
 ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
 
@@ -27,6 +29,10 @@ ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c
 l_lock.c: @LUSTRE@/ldlm/l_lock.c
 	ln -sf $< $@
 
+interval_tree.c: @LUSTRE@/ldlm/interval_tree.c
+	ln -sf $< $@
+
+EXTRA_DIST = $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
 
 @INCLUDE_RULES@