[CRIU] [PATCH 2/6] compel: plugins, std -- Move in log engine from criu pie

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/plugins/Makefile                           | 1 +
 criu/pie/log-simple.c => compel/plugins/std/log.c | 0
 criu/pie/Makefile.library                         | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename criu/pie/log-simple.c => compel/plugins/std/log.c (100%)

diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 4cfeced4c778..ccd74d5156b6 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -48,6 +48,7 @@ shmem-obj-y		+= shmem/shmem.o
 # STD plugin
 target			+= std
 std-obj-y		+= std/std.o
+std-obj-y		+= std/log.o
 std-obj-y		+= std/string.o
 
 include ./$(PLUGIN_ARCH_DIR)/std/syscalls/Makefile.syscalls
diff --git a/criu/pie/log-simple.c b/compel/plugins/std/log.c
similarity index 100%
rename from criu/pie/log-simple.c
rename to compel/plugins/std/log.c
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 007823124150..f928c865571b 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -17,7 +17,7 @@ ifeq ($(ARCH),x86)
         OBJS		+= ./$(ARCH_DIR)/memcpy.o
 endif
 
-OBJS			+= log-simple.o util-fd.o util.o
+OBJS			+= util-fd.o util.o
 
 ifeq ($(VDSO),y)
         OBJS		+= util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
-- 
2.7.4