[CRIU] [PATCH 55/78] compel: Rename shipped library to libcompel.a

Cyrill Gorcunov gorcunov at openvz.org
Mon Nov 7 08:36:40 PST 2016


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile.compel | 4 ++--
 compel/Makefile | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.compel b/Makefile.compel
index 84d5c0769a71..88566501111a 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -57,7 +57,7 @@ compel/plugins/shmem.built-in.o: $(compel-deps) .FORCE
 compel/plugins/fds.built-in.o: $(compel-deps) .FORCE
 	$(Q) $(MAKE) $(build)=compel/plugins $@
 
-compel/compel: compel/built-in.o compel/lib.a | $(compel-deps)
+compel/compel: compel/built-in.o compel/libcompel.a | $(compel-deps)
 	$(call msg-link, $@)
 	$(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@
 
@@ -65,6 +65,6 @@ compel/compel: compel/built-in.o compel/lib.a | $(compel-deps)
 # And compel library.
 LIBCOMPEL_SO		:= libcompel.so
 LIBCOMPEL_SO_CFLAGS	+= $(CFLAGS) -rdynamic -Wl,-soname,$(LIBCOMPEL_SO).$(COMPEL_SO_VERSION_MAJOR)
-compel/$(LIBCOMPEL_SO): compel/lib.a
+compel/$(LIBCOMPEL_SO): compel/libcompel.a
 	$(call msg-link, $@)
 	$(Q) $(CC) -shared $(LIBCOMPEL_SO_CFLAGS) -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDFLAGS)
diff --git a/compel/Makefile b/compel/Makefile
index 2cc11f7fbcc9..71e646ce8070 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -14,6 +14,7 @@ ccflags-y		+= -fPIC
 ccflags-y		+= -I compel/include/uapi
 ccflags-y		+= -I compel/plugins/include/uapi
 
+lib-name		:= libcompel.a
 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
-- 
2.7.4



More information about the CRIU mailing list