Skip to content
Snippets Groups Projects
Commit f0762602 authored by Yuriy Vostrikov's avatar Yuriy Vostrikov
Browse files

[core] partially rollback 8cb4a2b4, make incremental builds work again

parent 9f3ab593
No related branches found
No related tags found
No related merge requests found
obj += cfg/warning.o obj += cfg/warning.o
obj += cfg/tarantool_$(module)_cfg.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) 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) cfg/tarantool_$(module)_cfg.cfg_tmpl: cfg/core_cfg.cfg_tmpl $(cfg_tmpl)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo '%{ ' > $@ @echo '%{ ' > $@
...@@ -19,4 +13,5 @@ cfg/tarantool_$(module)_cfg.cfg_tmpl: cfg/core_cfg.cfg_tmpl $(cfg_tmpl) ...@@ -19,4 +13,5 @@ cfg/tarantool_$(module)_cfg.cfg_tmpl: cfg/core_cfg.cfg_tmpl $(cfg_tmpl)
$(CAT) $^ >> $@ $(CAT) $^ >> $@
endif endif
CFLAGS += -DTARANTOOL_CONFIG='<cfg/tarantool_$(module)_cfg.h>'
cfg/tarantool_$(module)_cfg.o: CFLAGS += -Wno-unused cfg/tarantool_$(module)_cfg.o: CFLAGS += -Wno-unused
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <tbuf.h> #include <tbuf.h>
#include <util.h> #include <util.h>
#include <log_io.h> #include <log_io.h>
#include <cfg/tarantool_cfg.h> #include TARANTOOL_CONFIG
struct recovery_state *recovery_state; struct recovery_state *recovery_state;
void mod_init(void); void mod_init(void);
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
INDENT=$(which gindent 2>/dev/null || which indent 2>/dev/null) INDENT=$(which gindent 2>/dev/null || which indent 2>/dev/null)
[ -z $INDENT ] && echo indent binary not found && exit 1 [ -z $INDENT ] && echo indent binary not found && exit 1
CPP_FLAGS="-I. -Iinclude -DCORO_ASM -DSTORAGE"
for f in $@ for f in $@
do do
PARAM="-npro -kr -i8 -ts8 -ci8 -sob -l100 -ss -ncs -cp1 PARAM="-npro -kr -i8 -ts8 -ci8 -sob -l100 -ss -ncs -cp1
...@@ -21,7 +19,7 @@ do ...@@ -21,7 +19,7 @@ do
;; ;;
esac 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 $INDENT $PARAM $f
done done
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment