Commit c30a793b authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Andrei Vagin

Makefiles: get rid of extra includes

Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 85b04c8b
...@@ -21,7 +21,6 @@ ccflags-y += -iquote criu/include ...@@ -21,7 +21,6 @@ ccflags-y += -iquote criu/include
ccflags-y += -iquote include ccflags-y += -iquote include
ccflags-y += -iquote images ccflags-y += -iquote images
ccflags-y += -iquote criu/pie ccflags-y += -iquote criu/pie
ccflags-y += -iquote $(ARCH_DIR)
ccflags-y += -iquote $(ARCH_DIR)/include ccflags-y += -iquote $(ARCH_DIR)/include
ccflags-y += -iquote . ccflags-y += -iquote .
ccflags-y += -I/usr/include/libnl3 ccflags-y += -I/usr/include/libnl3
......
builtin-name := crtools.built-in.o builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj)
ccflags-y += -iquote $(obj)/include -iquote criu/include ccflags-y += -iquote $(obj)/include -iquote criu/include
ccflags-y += -iquote include ccflags-y += -iquote include
ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += $(COMPEL_UAPI_INCLUDES)
......
builtin-name := crtools.built-in.o builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(obj)/include ccflags-y += -iquote $(obj)/include
ccflags-y += -iquote criu/include -iquote include ccflags-y += -iquote criu/include -iquote include
ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += $(COMPEL_UAPI_INCLUDES)
......
builtin-name := crtools.built-in.o builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote $(obj)/include ccflags-y += -iquote $(obj)/include
ccflags-y += -iquote criu/include -iquote include ccflags-y += -iquote criu/include -iquote include
ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += $(COMPEL_UAPI_INCLUDES)
......
builtin-name := crtools.built-in.o builtin-name := crtools.built-in.o
ccflags-y += -iquote $(obj) -iquote . -iquote $(obj)/include ccflags-y += -iquote $(obj)/include
ccflags-y += -iquote criu/include -iquote include ccflags-y += -iquote criu/include -iquote include
ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += $(COMPEL_UAPI_INCLUDES)
......
...@@ -19,9 +19,6 @@ endif ...@@ -19,9 +19,6 @@ endif
# #
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS)) CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS))
CFLAGS += -iquote criu/arch/$(ARCH)/include
CFLAGS += -iquote criu/include
CFLAGS += -iquote include
ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += $(COMPEL_UAPI_INCLUDES)
ccflags-y += -DCR_NOGLIBC ccflags-y += -DCR_NOGLIBC
......
...@@ -34,8 +34,6 @@ endif ...@@ -34,8 +34,6 @@ endif
# applications, which is not the target of the # applications, which is not the target of the
# project. # project.
# #
iquotes += -iquote $(ARCH_DIR)/include
iquotes += -iquote criu/include -iquote include
CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes) CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS)) CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS))
......
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