mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-01 23:05:39 +00:00
Makefiles: get rid of extra includes
Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
committed by
Andrei Vagin
parent
85b04c8bfd
commit
c30a793bec
@@ -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
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
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)
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
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)
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
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)
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
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
|
|||||||
#
|
#
|
||||||
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
|
|||||||
# 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))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user