Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit73afabc

Browse files
committed
Fix update-unicode target
The normalization-check target needs to be run last, after moving thenewly generated files into place. Also, we need an additionaldependency so that unicode_norm.o is rebuilt first. Otherwise,norm_test will still test the old files but against the new expectedresults, which will probably fail.
1 parent00f4aba commit73afabc

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

‎src/common/unicode/Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ LIBS += $(PTHREAD_LIBS)
1919
all:
2020

2121
update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h
22-
$(MAKE) normalization-check
2322
mv$^ ../../../src/include/common/
23+
$(MAKE) normalization-check
2424

2525
# These files are part of the Unicode Character Database. Download
2626
# them on demand. The dependency on Makefile.global is for
@@ -43,10 +43,15 @@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizat
4343
normalization-check: norm_test
4444
./norm_test
4545

46-
norm_test: norm_test.o ../unicode_norm.o
46+
norm_test: norm_test.o ../unicode_norm.o | submake-common
4747

4848
norm_test.o: norm_test_table.h
4949

50+
.PHONY: submake-common
51+
52+
submake-common:
53+
$(MAKE) -C .. all
54+
5055
norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt
5156
perl generate-norm_test_table.pl NormalizationTest.txt$@
5257

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp