LU-16335 test: add fail_abort_cleanup()

[fs/lustre-release.git] / lustre / ptlrpc / Makefile.in

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index 94e4c1a..97de719 100644 (file)
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,27 +1,41 @@
 MODULES := ptlrpc
-ifeq ($(PATCHLEVEL),6)
-LDLM := @top_srcdir@/ldlm/
-else
-LDLM :=
-endif
-ptlrpc-objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
-ptlrpc-objs += $(LDLM)ldlm_resource.o $(LDLM)ldlm_lib.o
-ptlrpc-objs += $(LDLM)ldlm_plain.o $(LDLM)ldlm_extent.o
-ptlrpc-objs += $(LDLM)ldlm_request.o $(LDLM)ldlm_lockd.o
-ptlrpc-objs += $(LDLM)ldlm_flock.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
+ptlrpc_dir := $(dir $(lastword $(MAKEFILE_LIST)))
+LDLM := @top_srcdir@/lustre/ldlm/
+TARGET := @top_srcdir@/lustre/target/
 
-default: all
+ptlrpc_objs := client.o recover.o connection.o niobuf.o pack_generic.o
+ptlrpc_objs += events.o ptlrpc_module.o service.o pinger.o
+ptlrpc_objs += llog_net.o llog_client.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_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
+
+-include $(ptlrpc_dir)/../ldlm/Makefile
+@SERVER_TRUE@-include $(ptlrpc_dir)/../target/Makefile
 
-ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c
-       ln -sf $< $@
+ptlrpc-objs := $(ptlrpc_objs)
+ptlrpc-objs += $(patsubst %,$(LDLM)%,$(ldlm_objs))
+@SERVER_TRUE@ptlrpc-objs += $(nodemap_objs) $(nrs_server_objs)
+@SERVER_TRUE@ptlrpc-objs += pack_server.o llog_server.o
+@SERVER_TRUE@ptlrpc-objs += $(patsubst %,$(TARGET)%,$(target_objs))
+
+@GSS_TRUE@obj-m += gss/
+
+default: all
 
-l_lock.c: @LUSTRE@/ldlm/l_lock.c
-       ln -sf $< $@
+EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_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_DIST += llog_server.c
 
-EXTRA_CFLAGS := -I@LUSTRE@/ldlm
+EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target
 
 @INCLUDE_RULES@