mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-04 08:15:37 +00:00
Makefile.config: don't silent twice
Here $(Q) is substituted with either @ or nothing, depending on whether V is set, to either have verbose output or not. So, it does not make sense to add another @. Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
committed by
Andrei Vagin
parent
f07bd47fde
commit
6fe7e9eab4
@@ -44,24 +44,24 @@ FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
|
|||||||
# $1 - config name
|
# $1 - config name
|
||||||
define gen-feature-test
|
define gen-feature-test
|
||||||
ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
|
ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
|
||||||
$(Q) @echo '#define CONFIG_HAS_$(1)' >> $$@
|
$(Q) echo '#define CONFIG_HAS_$(1)' >> $$@
|
||||||
$(Q) @echo '' >> $$@
|
$(Q) echo '' >> $$@
|
||||||
endif
|
endif
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define config-header-rule
|
define config-header-rule
|
||||||
$(CONFIG_HEADER): scripts/feature-tests.mak $(CONFIG_FILE)
|
$(CONFIG_HEADER): scripts/feature-tests.mak $(CONFIG_FILE)
|
||||||
$$(call msg-gen, $$@)
|
$(call msg-gen, $$@)
|
||||||
$(Q) @echo '#ifndef __CR_CONFIG_H__' > $$@
|
$(Q) echo '#ifndef __CR_CONFIG_H__' > $$@
|
||||||
$(Q) @echo '#define __CR_CONFIG_H__' >> $$@
|
$(Q) echo '#define __CR_CONFIG_H__' >> $$@
|
||||||
$(Q) @echo '' >> $$@
|
$(Q) echo '' >> $$@
|
||||||
$(call map,gen-feature-test,$(FEATURES_LIST))
|
$(call map,gen-feature-test,$(FEATURES_LIST))
|
||||||
$(Q) @cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
|
$(Q) cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
|
||||||
ifeq ($$(VDSO),y)
|
ifeq ($$(VDSO),y)
|
||||||
$(Q) @echo '#define CONFIG_VDSO' >> $$@
|
$(Q) echo '#define CONFIG_VDSO' >> $$@
|
||||||
$(Q) @echo '' >> $$@
|
$(Q) echo '' >> $$@
|
||||||
endif
|
endif
|
||||||
$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $$@
|
$(Q) echo '#endif /* __CR_CONFIG_H__ */' >> $$@
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(config-header-rule))
|
$(eval $(config-header-rule))
|
||||||
|
Reference in New Issue
Block a user