From 73afabcdc20e227beb8094efb44753b4de1c5c0a Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 19 Apr 2020 14:59:29 +0200 Subject: [PATCH] Fix update-unicode target The normalization-check target needs to be run last, after moving the newly generated files into place. Also, we need an additional dependency so that unicode_norm.o is rebuilt first. Otherwise, norm_test will still test the old files but against the new expected results, which will probably fail. --- src/common/unicode/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/unicode/Makefile b/src/common/unicode/Makefile index 7a37ec7b55..93a9d1615f 100644 --- a/src/common/unicode/Makefile +++ b/src/common/unicode/Makefile @@ -19,8 +19,8 @@ LIBS += $(PTHREAD_LIBS) all: update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h - $(MAKE) normalization-check mv $^ ../../../src/include/common/ + $(MAKE) normalization-check # These files are part of the Unicode Character Database. Download # them on demand. The dependency on Makefile.global is for @@ -43,10 +43,15 @@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizat normalization-check: norm_test ./norm_test -norm_test: norm_test.o ../unicode_norm.o +norm_test: norm_test.o ../unicode_norm.o | submake-common norm_test.o: norm_test_table.h +.PHONY: submake-common + +submake-common: + $(MAKE) -C .. all + norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt perl generate-norm_test_table.pl NormalizationTest.txt $@