X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FMakefile.in;h=0ea5fbf3f4dfe5fdbbb54df5880b37808da2e677;hb=303ea892488b985ba84e6c8e1481f6c7c914c7ed;hp=cc625c60af6849e430cc99542a6ee16a2ef30c66;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index cc625c6..0ea5fbf 100644
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,20 +1,27 @@
 MODULES := ptlrpc
-ifeq ($(PATCHLEVEL),6)
 LDLM := @top_srcdir@/lustre/ldlm/
-else
-LDLM :=
-endif
-ldlm_objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
+TARGET := @top_srcdir@/lustre/target/
+
+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
+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 nrs.o nrs_fifo.o
+
+target_objs := $(TARGET)tgt_main.o $(TARGET)tgt_lastrcvd.o
 
 ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
+@SERVER_TRUE@ptlrpc-objs += $(target_objs)
+
+@GSS_TRUE@subdir-m += gss
 
 default: all
 
@@ -24,6 +31,15 @@ ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c
 l_lock.c: @LUSTRE@/ldlm/l_lock.c
 	ln -sf $< $@
 
-EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
+interval_tree.c: @LUSTRE@/ldlm/interval_tree.c
+	ln -sf $< $@
+
+tgt_%.c: @LUSTRE@/target/tgt_%.c
+	ln -sf $< $@
+
+EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
+@SERVER_TRUE@EXTRA_DIST += $(TARGET)tgt_internal.h
+
+EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target
 
 @INCLUDE_RULES@