From 50d3f531ee96ffa862bc05429814ba104dddd4a2 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Wed, 3 Jun 2020 17:59:41 +0430
Subject: [PATCH] Use output names in update-unicode-tables.make

---
 src/update-unicode-tables.make | 47 +++++++++++++++-------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/update-unicode-tables.make b/src/update-unicode-tables.make
index 519e38e2d..c2d879a39 100755
--- a/src/update-unicode-tables.make
+++ b/src/update-unicode-tables.make
@@ -1,54 +1,49 @@
 #!/usr/bin/env -S make -f
 
-all: packtab arabic-table emoji-table indic-table tag-table ucd-table use-table vowel-constraints
+all: packtab \
+	hb-ot-shape-complex-arabic-table.hh hb-unicode-emoji-table.hh \
+	hb-ot-shape-complex-indic-table.cc hb-ot-tag-table.hh \
+	hb-ucd-table.hh hb-ot-shape-complex-use-table.cc \
+	hb-ot-shape-complex-vowel-constraints.cc
 
-.PHONY: all clean packtab arabic-table emoji-table indic-table tag-table ucd-table use-table vowel-constraints
+.PHONY: all clean packtab
 
-arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt
-	./$^ > hb-ot-shape-complex-arabic-table.hh || (rm hb-ot-shape-complex-arabic-table.hh; false)
-emoji-table: gen-emoji-table.py emoji-data.txt
-	./$^ > hb-unicode-emoji-table.hh || (rm hb-unicode-emoji-table.hh; false)
-indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt
-	./$^ > hb-ot-shape-complex-indic-table.cc || (rm hb-ot-shape-complex-indic-table.cc; false)
-tag-table: gen-tag-table.py languagetags language-subtag-registry
-	./$^ > hb-ot-tag-table.hh || (rm hb-ot-tag-table.hh; false)
-ucd-table: gen-ucd-table.py ucd.nounihan.grouped.zip hb-common.h
-	./$^ > hb-ucd-table.hh || (rm hb-ucd-table.hh; false)
-use-table: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt
-	./$^ > hb-ot-shape-complex-use-table.cc || (rm hb-ot-shape-complex-use-table.cc; false)
-vowel-constraints: gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt
-	./$^ > hb-ot-shape-complex-vowel-constraints.cc || (hb-ot-shape-complex-vowel-constraints.cc; false)
+hb-ot-shape-complex-arabic-table.hh: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt
+	./$^ > $@ || ($(RM) $@; false)
+hb-unicode-emoji-table.hh: gen-emoji-table.py emoji-data.txt
+	./$^ > $@ || ($(RM) $@; false)
+hb-ot-shape-complex-indic-table.cc: gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt
+	./$^ > $@ || ($(RM) $@; false)
+hb-ot-tag-table.hh: gen-tag-table.py languagetags language-subtag-registry
+	./$^ > $@ || ($(RM) $@; false)
+hb-ucd-table.hh: gen-ucd-table.py ucd.nounihan.grouped.zip hb-common.h
+	./$^ > $@ || ($(RM) $@; false)
+hb-ot-shape-complex-use-table.cc: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt
+	./$^ > $@ || ($(RM) $@; false)
+hb-ot-shape-complex-vowel-constraints.cc: gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt
+	./$^ > $@ || ($(RM) $@; false)
 
 packtab:
-	/usr/bin/env python3 -c "import packTab" 2>/dev/null || /usr/bin/env pip3 install git+https://github.com/harfbuzz/packtab
+	/usr/bin/env python3 -c "import packTab" 2>/dev/null || /usr/bin/env python3 -m pip install git+https://github.com/harfbuzz/packtab
 
 ArabicShaping.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/ArabicShaping.txt
-
 UnicodeData.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
-
 Blocks.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/Blocks.txt
-
 emoji-data.txt:
 	curl -O https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt
-
 IndicSyllabicCategory.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/IndicSyllabicCategory.txt
-
 IndicPositionalCategory.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/IndicPositionalCategory.txt
-
 languagetags:
 	curl -O https://docs.microsoft.com/en-us/typography/opentype/spec/languagetags
-
 language-subtag-registry:
 	curl -O https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
-
 ucd.nounihan.grouped.zip:
 	curl -O https://unicode.org/Public/UCD/latest/ucdxml/ucd.nounihan.grouped.zip
-
 Scripts.txt:
 	curl -O https://unicode.org/Public/UCD/latest/ucd/Scripts.txt