[CRIU] [PATCH 2/3] Revert "compel: Move lib files into lib-y"

[Dmitry Safonov]

This reverts commit 6b0292e12614.

handle_binary() is needed for preparing PIE header during compilation.
If we need to provide API for building another compel binary, probably
it should be a separate library from libcompel.{a,so}

IOW, there is no sense to have handle_binary() included into CRIU.
For CRIU it's needed only during the build to generate parasite header.

Move handle_elf() to compel binary from library, as it was previously
corrected in commit 64bb75a859cd ("compel: Drop off handle-elf routines
from library").

Cc: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Dmitry Safonov <dima at arista.com>
---
 compel/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compel/Makefile b/compel/Makefile
index f751d6a740bd..7ef01aa0104c 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -24,10 +24,6 @@ host-lib-y		+= src/lib/log.o
 
 lib-y			+= arch/$(ARCH)/src/lib/cpu.o
 lib-y			+= arch/$(ARCH)/src/lib/infect.o
-lib-y			+= arch/$(ARCH)/src/lib/handle-elf.o
-host-lib-y		+= arch/$(ARCH)/src/lib/handle-elf.o
-lib-y			+= src/lib/handle-elf.o
-host-lib-y		+= src/lib/handle-elf.o
 lib-y			+= src/lib/infect-rpc.o
 lib-y			+= src/lib/infect-util.o
 lib-y			+= src/lib/infect.o
@@ -40,6 +36,8 @@ HOSTCFLAGS		+= -DNO_RELOCS
 endif
 
 obj-y			+= src/main.o
+obj-y			+= arch/$(ARCH)/src/lib/handle-elf.o
+obj-y			+= src/lib/handle-elf.o
 
 host-ccflags-y		+= $(ccflags-y)
 
-- 
2.19.1