blob: b311754e1538669b33eb6537ba484b2672a69f8f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
https://github.com/koron/cmigemo/pull/28
From fd4bad807a9a52130d58269a4b1507a8720c5ae6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 12 Nov 2021 15:16:54 +0000
Subject: [PATCH] Add directory dependencies to fix parallel builds
When building in parallel (make -j) sometimes make would try to create
a dictionary file before the directory containing it had been
created. To fix this, I've made the directory a dependency of each
file in it, rather than having them be sibling dependencies of the
-files targets.
---
dict/dict.mak | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dict/dict.mak b/dict/dict.mak
index 8ea8a66..44bd543 100644
--- a/dict/dict.mak
+++ b/dict/dict.mak
@@ -33,40 +33,40 @@ cp932: $(DICT)
# Dictionary in euc-jp
#
euc-jp: cp932 euc-jp-files
-euc-jp-files: $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict \
+euc-jp-files: $(EUCJP_DIR)/migemo-dict \
$(EUCJP_DIR)/zen2han.dat $(EUCJP_DIR)/han2zen.dat \
$(EUCJP_DIR)/hira2kata.dat $(EUCJP_DIR)/roma2hira.dat
$(EUCJP_DIR):
$(MKDIR) $(EUCJP_DIR)
-$(EUCJP_DIR)/migemo-dict: migemo-dict
+$(EUCJP_DIR)/migemo-dict: $(EUCJP_DIR) migemo-dict
$(FILTER_EUCJP) < migemo-dict > $@
-$(EUCJP_DIR)/zen2han.dat: zen2han.dat
+$(EUCJP_DIR)/zen2han.dat: $(EUCJP_DIR) zen2han.dat
$(FILTER_EUCJP) < zen2han.dat > $@
-$(EUCJP_DIR)/han2zen.dat: han2zen.dat
+$(EUCJP_DIR)/han2zen.dat: $(EUCJP_DIR) han2zen.dat
$(FILTER_EUCJP) < han2zen.dat > $@
-$(EUCJP_DIR)/hira2kata.dat: hira2kata.dat
+$(EUCJP_DIR)/hira2kata.dat: $(EUCJP_DIR) hira2kata.dat
$(FILTER_EUCJP) < hira2kata.dat > $@
-$(EUCJP_DIR)/roma2hira.dat: roma2hira.dat
+$(EUCJP_DIR)/roma2hira.dat: $(EUCJP_DIR) roma2hira.dat
$(FILTER_EUCJP) < roma2hira.dat > $@
##############################################################################
# Dictionary in utf-8
#
utf-8: cp932 utf-8-files
-utf-8-files: $(UTF8_DIR) $(UTF8_DIR)/migemo-dict \
+utf-8-files: $(UTF8_DIR)/migemo-dict \
$(UTF8_DIR)/zen2han.dat $(UTF8_DIR)/han2zen.dat \
$(UTF8_DIR)/hira2kata.dat $(UTF8_DIR)/roma2hira.dat
$(UTF8_DIR):
$(MKDIR) $(UTF8_DIR)
-$(UTF8_DIR)/migemo-dict: migemo-dict
+$(UTF8_DIR)/migemo-dict: $(UTF8_DIR) migemo-dict
$(FILTER_UTF8) < migemo-dict > $@
-$(UTF8_DIR)/zen2han.dat: zen2han.dat
+$(UTF8_DIR)/zen2han.dat: $(UTF8_DIR) zen2han.dat
$(FILTER_UTF8) < zen2han.dat > $@
-$(UTF8_DIR)/han2zen.dat: han2zen.dat
+$(UTF8_DIR)/han2zen.dat: $(UTF8_DIR) han2zen.dat
$(FILTER_UTF8) < han2zen.dat > $@
-$(UTF8_DIR)/hira2kata.dat: hira2kata.dat
+$(UTF8_DIR)/hira2kata.dat: $(UTF8_DIR) hira2kata.dat
$(FILTER_UTF8) < hira2kata.dat > $@
-$(UTF8_DIR)/roma2hira.dat: roma2hira.dat
+$(UTF8_DIR)/roma2hira.dat: $(UTF8_DIR) roma2hira.dat
$(FILTER_UTF8) < roma2hira.dat > $@
##############################################################################
|
