Commit 545bac9b authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Andrei Vagin

Makefiles: rm -I compel/plugins... from cflags

I have noticed compel/plugins/include[/uapi] is not needed,
not entirely sure why (added symlinks?) but everything
compiles just fine without it.

travis-ci: success for More polishing for compel cli
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 51c4569c
...@@ -5,14 +5,12 @@ COMPEL_SO_VERSION_CODE := $(shell expr $(COMPEL_SO_VERSION_MAJOR) \* 65536 \+ $( ...@@ -5,14 +5,12 @@ COMPEL_SO_VERSION_CODE := $(shell expr $(COMPEL_SO_VERSION_MAJOR) \* 65536 \+ $(
ccflags-y += -DINCLUDEDIR=\"$(INCLUDEDIR)\" ccflags-y += -DINCLUDEDIR=\"$(INCLUDEDIR)\"
ccflags-y += -iquote compel/arch/$(ARCH)/src/lib/include ccflags-y += -iquote compel/arch/$(ARCH)/src/lib/include
ccflags-y += -iquote compel/include ccflags-y += -iquote compel/include
ccflags-y += -iquote compel/plugins/include
ccflags-y += -fno-strict-aliasing ccflags-y += -fno-strict-aliasing
ccflags-y += -fPIC ccflags-y += -fPIC
# #
# UAPI inclusion, referred as <compel/...> # UAPI inclusion, referred as <compel/...>
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
lib-name := $(LIBCOMPEL_A) lib-name := $(LIBCOMPEL_A)
lib-y += src/lib/log.o lib-y += src/lib/log.o
......
...@@ -9,9 +9,7 @@ PLUGIN_ARCH_DIR := compel/arch/$(ARCH)/plugins ...@@ -9,9 +9,7 @@ PLUGIN_ARCH_DIR := compel/arch/$(ARCH)/plugins
# #
# UAPI inclusion, referred as <compel/...> # UAPI inclusion, referred as <compel/...>
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -I compel/include/uapi asflags-y += -I compel/include/uapi
asflags-y += -I compel/plugins/include/uapi
# General compel includes # General compel includes
ccflags-y += -iquote $(SRC_DIR)/compel/include ccflags-y += -iquote $(SRC_DIR)/compel/include
......
...@@ -18,7 +18,6 @@ ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)/include ...@@ -18,7 +18,6 @@ ccflags-y += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
ccflags-y += -iquote $(SRC_DIR)/ ccflags-y += -iquote $(SRC_DIR)/
ccflags-y += -I/usr/include/libnl3 ccflags-y += -I/usr/include/libnl3
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
export ccflags-y export ccflags-y
......
ccflags-y += -iquote criu/$(ARCH) ccflags-y += -iquote criu/$(ARCH)
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
obj-y += action-scripts.o obj-y += action-scripts.o
obj-y += external.o obj-y += external.o
......
...@@ -4,7 +4,6 @@ ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) ...@@ -4,7 +4,6 @@ ccflags-y += -iquote $(obj) -iquote $(SRC_DIR)
ccflags-y += -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include ccflags-y += -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
ccflags-y += -iquote $(SRC_DIR)/include ccflags-y += -iquote $(SRC_DIR)/include
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -D__ASSEMBLY__ asflags-y += -D__ASSEMBLY__
obj-y += cpu.o obj-y += cpu.o
......
...@@ -4,7 +4,6 @@ ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include ...@@ -4,7 +4,6 @@ ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -D__ASSEMBLY__ asflags-y += -D__ASSEMBLY__
......
...@@ -3,7 +3,6 @@ builtin-name := crtools.built-in.o ...@@ -3,7 +3,6 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
obj-y += cpu.o obj-y += cpu.o
obj-y += crtools.o obj-y += crtools.o
......
...@@ -3,7 +3,6 @@ builtin-name := crtools.built-in.o ...@@ -3,7 +3,6 @@ builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include ccflags-y += -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include ccflags-y += -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
asflags-y += -Wstrict-prototypes -Wa,--noexecstack asflags-y += -Wstrict-prototypes -Wa,--noexecstack
asflags-y += -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer asflags-y += -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
......
...@@ -31,7 +31,6 @@ CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ...@@ -31,7 +31,6 @@ CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -DCR_NOGLIBC ccflags-y += -DCR_NOGLIBC
ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
......
...@@ -42,7 +42,6 @@ iquotes += -iquote $(SRC_DIR)/$(ARCH_DIR)/include ...@@ -42,7 +42,6 @@ iquotes += -iquote $(SRC_DIR)/$(ARCH_DIR)/include
iquotes += -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include iquotes += -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes) CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
asflags-y := -D__ASSEMBLY__ $(iquotes) asflags-y := -D__ASSEMBLY__ $(iquotes)
ccflags-y += -I compel/plugins/include/uapi
ccflags-y += -I compel/include/uapi ccflags-y += -I compel/include/uapi
ifeq ($(SRCARCH),arm) ifeq ($(SRCARCH),arm)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment