Makefiles: seg_*.db => segbits_*.db consistency

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-11-14 12:01:35 -08:00
parent 2ad3af5343
commit f4ec5cf9d0
3 changed files with 10 additions and 10 deletions

View File

@ -5,11 +5,11 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/seg_clblx.db $(addsuffix /segdata_clblm_[lr].txt,$(SPECIMENS))
${XRAY_SEGMATCH} -o build/segbits_clblx.db $(addsuffix /segdata_clblm_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_MERGEDB} clblm_l build/seg_clblx.db
${XRAY_MERGEDB} clblm_r build/seg_clblx.db
${XRAY_MERGEDB} clblm_l build/segbits_clblx.db
${XRAY_MERGEDB} clblm_r build/segbits_clblx.db
build:
mkdir build

View File

@ -3,11 +3,11 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
${XRAY_SEGMATCH} -o build/segbits_bramx.block_ram.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.db
${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.db
${XRAY_MERGEDB} bram_l.block_ram build/segbits_bramx.block_ram.db
${XRAY_MERGEDB} bram_r.block_ram build/segbits_bramx.block_ram.db
build:
mkdir build

View File

@ -4,8 +4,8 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS))
${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
${XRAY_SEGMATCH} -m 5 -M 15 -o build/segbits_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS))
${XRAY_SEGMATCH} -m 5 -M 15 -o build/segbits_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
${XRAY_MASKMERGE} build/mask_clbll_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS))
${XRAY_MASKMERGE} build/mask_clbll_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
${XRAY_MASKMERGE} build/mask_clblm_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS))
@ -13,8 +13,8 @@ database: $(SPECIMENS_OK)
${XRAY_DBFIXUP} --db-root build --clb-int
pushdb:
${XRAY_MERGEDB} int_l build/seg_int_l.db
${XRAY_MERGEDB} int_r build/seg_int_r.db
${XRAY_MERGEDB} int_l build/segbits_int_l.db
${XRAY_MERGEDB} int_r build/segbits_int_r.db
${XRAY_MERGEDB} mask_clbll_l build/mask_clbll_l.db
${XRAY_MERGEDB} mask_clbll_r build/mask_clbll_r.db
${XRAY_MERGEDB} mask_clblm_l build/mask_clblm_l.db