scst: Fix in-tree build for kernel 4.3

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6662 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scripts/generate-kernel-patch

@@ -304,7 +304,9 @@ done
 
 scst_03_public_headers="scst/include/scst.h scst/include/scst_const.h \
 scst/include/scst_event.h scst/include/backport.h"
-scst_04_main="scst/src/scst_main.c scst/src/scst_module.c scst/src/scst_priv.h"
+scst_04_main="scst/src/scst_main.c scst/src/scst_module.c scst/src/scst_priv.h \
+scst/src/scst_copy_mgr.c scst/src/scst_dlm.c scst/src/scst_dlm.h \
+scst/src/scst_event.c scst/src/scst_no_dlm.c"
 scst_05_targ="scst/src/scst_targ.c"
 scst_06_lib="scst/src/scst_lib.c"
 scst_07_pres="scst/src/scst_pres.h scst/src/scst_pres.c"

scst/kernel/in-tree/Makefile.scst-4.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/

scst/src/scst_copy_mgr.c

@@ -11,7 +11,11 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/scst.h>
+#else
 #include "scst.h"
+#endif
 #include "scst_priv.h"
 #include "scst_pres.h"