From a8e9edf349ab011a6c889d8b706b5ad33c9b2a0b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Wed, 11 Nov 2015 05:12:38 +0000
Subject: [PATCH] scst: Fix in-tree build for kernels before 4.3

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6663 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/kernel/in-tree/Makefile.scst-2.6.23 | 23 +++++++++++++----------
 scst/kernel/in-tree/Makefile.scst-2.6.24 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.25 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.26 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.27 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.28 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.29 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.30 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.31 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.32 | 21 ++++++++++++---------
 scst/kernel/in-tree/Makefile.scst-2.6.33 | 20 ++++++++++++--------
 scst/kernel/in-tree/Makefile.scst-2.6.34 | 20 ++++++++++++--------
 scst/kernel/in-tree/Makefile.scst-2.6.35 | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-2.6.36 | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-2.6.37 | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-2.6.38 | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-2.6.39 | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.0    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.1    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.10   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.11   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.12   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.13   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.14   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.15   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.16   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.17   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.18   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.19   | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.2    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.3    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.4    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.5    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.6    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.7    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.8    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-3.9    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-4.0    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-4.1    | 18 +++++++++++-------
 scst/kernel/in-tree/Makefile.scst-4.2    | 18 +++++++++++-------
 40 files changed, 453 insertions(+), 303 deletions(-)

diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.23 b/scst/kernel/in-tree/Makefile.scst-2.6.23
index f801073af..09dc56ac9 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.23
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.23
@@ -1,14 +1,17 @@
-EXTRA_CFLAGS += -Iinclude/scst -Wno-unused-parameter
+EXTRA_CFLAGS += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_proc.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
-
+		     	scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.24 b/scst/kernel/in-tree/Makefile.scst-2.6.24
index e040252e4..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.24
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.24
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_proc.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.25 b/scst/kernel/in-tree/Makefile.scst-2.6.25
index e040252e4..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.25
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.25
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_proc.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.26 b/scst/kernel/in-tree/Makefile.scst-2.6.26
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.26
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.26
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.27 b/scst/kernel/in-tree/Makefile.scst-2.6.27
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.27
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.27
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.28 b/scst/kernel/in-tree/Makefile.scst-2.6.28
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.28
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.28
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.29 b/scst/kernel/in-tree/Makefile.scst-2.6.29
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.29
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.29
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.30 b/scst/kernel/in-tree/Makefile.scst-2.6.30
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.30
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.30
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.31 b/scst/kernel/in-tree/Makefile.scst-2.6.31
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.31
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.31
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.32 b/scst/kernel/in-tree/Makefile.scst-2.6.32
index 1379402be..7aacdd48e 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.32
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.32
@@ -1,14 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
 			scst_local/
-
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.33 b/scst/kernel/in-tree/Makefile.scst-2.6.33
index d2dd04dc2..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.33
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.33
@@ -1,13 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.34 b/scst/kernel/in-tree/Makefile.scst-2.6.34
index d2dd04dc2..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.34
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.34
@@ -1,13 +1,17 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.35 b/scst/kernel/in-tree/Makefile.scst-2.6.35
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.35
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.35
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.36 b/scst/kernel/in-tree/Makefile.scst-2.6.36
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.36
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.36
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.37 b/scst/kernel/in-tree/Makefile.scst-2.6.37
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.37
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.37
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.38 b/scst/kernel/in-tree/Makefile.scst-2.6.38
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.38
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.38
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.39 b/scst/kernel/in-tree/Makefile.scst-2.6.39
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-2.6.39
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.39
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.0 b/scst/kernel/in-tree/Makefile.scst-3.0
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.0
+++ b/scst/kernel/in-tree/Makefile.scst-3.0
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.1 b/scst/kernel/in-tree/Makefile.scst-3.1
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.1
+++ b/scst/kernel/in-tree/Makefile.scst-3.1
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.10 b/scst/kernel/in-tree/Makefile.scst-3.10
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.10
+++ b/scst/kernel/in-tree/Makefile.scst-3.10
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.11 b/scst/kernel/in-tree/Makefile.scst-3.11
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.11
+++ b/scst/kernel/in-tree/Makefile.scst-3.11
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.12 b/scst/kernel/in-tree/Makefile.scst-3.12
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.12
+++ b/scst/kernel/in-tree/Makefile.scst-3.12
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.13 b/scst/kernel/in-tree/Makefile.scst-3.13
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.13
+++ b/scst/kernel/in-tree/Makefile.scst-3.13
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.14 b/scst/kernel/in-tree/Makefile.scst-3.14
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.14
+++ b/scst/kernel/in-tree/Makefile.scst-3.14
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.15 b/scst/kernel/in-tree/Makefile.scst-3.15
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.15
+++ b/scst/kernel/in-tree/Makefile.scst-3.15
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.16 b/scst/kernel/in-tree/Makefile.scst-3.16
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.16
+++ b/scst/kernel/in-tree/Makefile.scst-3.16
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.17 b/scst/kernel/in-tree/Makefile.scst-3.17
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.17
+++ b/scst/kernel/in-tree/Makefile.scst-3.17
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.18 b/scst/kernel/in-tree/Makefile.scst-3.18
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.18
+++ b/scst/kernel/in-tree/Makefile.scst-3.18
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.19 b/scst/kernel/in-tree/Makefile.scst-3.19
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.19
+++ b/scst/kernel/in-tree/Makefile.scst-3.19
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.2 b/scst/kernel/in-tree/Makefile.scst-3.2
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.2
+++ b/scst/kernel/in-tree/Makefile.scst-3.2
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.3 b/scst/kernel/in-tree/Makefile.scst-3.3
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.3
+++ b/scst/kernel/in-tree/Makefile.scst-3.3
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.4 b/scst/kernel/in-tree/Makefile.scst-3.4
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.4
+++ b/scst/kernel/in-tree/Makefile.scst-3.4
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.5 b/scst/kernel/in-tree/Makefile.scst-3.5
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.5
+++ b/scst/kernel/in-tree/Makefile.scst-3.5
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.6 b/scst/kernel/in-tree/Makefile.scst-3.6
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.6
+++ b/scst/kernel/in-tree/Makefile.scst-3.6
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.7 b/scst/kernel/in-tree/Makefile.scst-3.7
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.7
+++ b/scst/kernel/in-tree/Makefile.scst-3.7
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.8 b/scst/kernel/in-tree/Makefile.scst-3.8
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.8
+++ b/scst/kernel/in-tree/Makefile.scst-3.8
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-3.9 b/scst/kernel/in-tree/Makefile.scst-3.9
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-3.9
+++ b/scst/kernel/in-tree/Makefile.scst-3.9
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-4.0 b/scst/kernel/in-tree/Makefile.scst-4.0
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-4.0
+++ b/scst/kernel/in-tree/Makefile.scst-4.0
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-4.1 b/scst/kernel/in-tree/Makefile.scst-4.1
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-4.1
+++ b/scst/kernel/in-tree/Makefile.scst-4.1
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-4.2 b/scst/kernel/in-tree/Makefile.scst-4.2
index 53af5f388..f4e0cc985 100644
--- a/scst/kernel/in-tree/Makefile.scst-4.2
+++ b/scst/kernel/in-tree/Makefile.scst-4.2
@@ -1,13 +1,17 @@
 ccflags-y += -Wno-unused-parameter
 
-scst-y        += scst_main.o
-scst-y        += scst_pres.o
-scst-y        += scst_targ.o
-scst-y        += scst_lib.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_mem.o
-scst-y        += scst_tg.o
+scst-y        += scst_copy_mgr.o
 scst-y        += scst_debug.o
+scst-y        += scst_dlm.o
+scst-y        += scst_event.o
+scst-y        += scst_lib.o
+scst-y        += scst_main.o
+scst-y        += scst_mem.o
+scst-y        += scst_no_dlm.o
+scst-y        += scst_pres.o
+scst-y        += scst_sysfs.o
+scst-y        += scst_targ.o
+scst-y        += scst_tg.o
 
 obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
 			srpt/ scst_local/