diff --git a/cfg/Makefile b/cfg/Makefile index 7ee40468dc4a8edf0eea68407a8c87b049aaf9e6..72e47d0c08d1990ef3e540c0df92ed024557a1ec 100644 --- a/cfg/Makefile +++ b/cfg/Makefile @@ -1,14 +1,8 @@ obj += cfg/warning.o obj += cfg/tarantool_$(module)_cfg.o -$(obj): cfg/tarantool_cfg.h -.PHONY: cfg/tarantool_cfg.h -cfg/tarantool_cfg.h: cfg/tarantool_$(module)_cfg.h - @mkdir -p cfg - @ln -sf $(abspath $<) $@ - ifeq ($(HAVE_CONFETTI),1) -cfg/tarantool_$(module)_cfg.h: cfg/tarantool_$(module)_cfg.cfg_tmpl +$(obj): cfg/tarantool_$(module)_cfg.h cfg/tarantool_$(module)_cfg.cfg cfg/tarantool_$(module)_cfg.cfg_tmpl: cfg/core_cfg.cfg_tmpl $(cfg_tmpl) @mkdir -p $(dir $@) @echo '%{ ' > $@ @@ -19,4 +13,5 @@ cfg/tarantool_$(module)_cfg.cfg_tmpl: cfg/core_cfg.cfg_tmpl $(cfg_tmpl) $(CAT) $^ >> $@ endif +CFLAGS += -DTARANTOOL_CONFIG='<cfg/tarantool_$(module)_cfg.h>' cfg/tarantool_$(module)_cfg.o: CFLAGS += -Wno-unused diff --git a/include/tarantool.h b/include/tarantool.h index 081932261193798c189729372e4615abef5a117c..ff8600b240be793c9186822d11c136329e4c65be 100644 --- a/include/tarantool.h +++ b/include/tarantool.h @@ -30,7 +30,7 @@ #include <tbuf.h> #include <util.h> #include <log_io.h> -#include <cfg/tarantool_cfg.h> +#include TARANTOOL_CONFIG struct recovery_state *recovery_state; void mod_init(void); diff --git a/scripts/indent b/scripts/indent index 5080ce6dce608f3c199484fd910826f7f30459bb..85548597d38246672b46973ee83449e36f90b1bf 100755 --- a/scripts/indent +++ b/scripts/indent @@ -2,8 +2,6 @@ INDENT=$(which gindent 2>/dev/null || which indent 2>/dev/null) [ -z $INDENT ] && echo indent binary not found && exit 1 -CPP_FLAGS="-I. -Iinclude -DCORO_ASM -DSTORAGE" - for f in $@ do PARAM="-npro -kr -i8 -ts8 -ci8 -sob -l100 -ss -ncs -cp1 @@ -21,7 +19,7 @@ do ;; esac - PARAM="$PARAM "$(scripts/custom_types $f $CPP_FLAGS | grep -v '^"_' | sed 's/"//g; s/^/-T /') + PARAM="$PARAM "$(scripts/custom_types $f -I. -Iinclude -DCORO_ASM -DSTORAGE -DTARANTOOL_CONFIG='<cfg/tarantool_silverbox_cfg.h>' | grep -v '^"_' | sed 's/"//g; s/^/-T /') $INDENT $PARAM $f done