lib: Move Unicode Character Database (UCD) files to ./ucd

diff --git a/.gitignore b/.gitignore
index 4d97b907c5ab3d3736d277ae5678aa7fb091cce5..c1158e9ebf443b47e2618d4f00f92d1be8e9e69b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,6 @@ src/lib/event-filter-lexer.c
 src/lib/event-filter-parser.c
 src/lib/event-filter-parser.h
 src/lib/unicodemap.c
-src/lib/UnicodeData.txt
 src/lib-compression/bench-compression
 src/lib-language/PropList.txt
 src/lib-language/WordBreakProperty.txt

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d2909ba545c78b78d6d066ce3d176d887acdee35..d0e2715984245778e2dc75dcc693f5a7dd0ef9a3 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,7 +8,14 @@ BUILT_SOURCES = $(srcdir)/unicodemap.c \
                event-filter-parser.c \
                event-filter-parser.h
 
-EXTRA_DIST = unicodemap.c unicodemap.pl UnicodeData.txt
+UCD_URL = https://dovecot.org/res
+UCD_DIR = $(srcdir)/ucd
+UCD_FILES = \
+       $(UCD_DIR)/UnicodeData.txt
+
+EXTRA_DIST = unicodemap.c unicodemap.pl $(UCD_FILES)
+EXTRA_CLEAN = unicodemap.c
+
 
 # Squelch autoconf error about using .[ly] sources but not defining $(LEX)
 # and $(YACC).  Using false here avoids accidental use.
@@ -30,11 +37,11 @@ YACC=/bin/false
 # dependency, anything including the header will race the bison process.
 event-filter-parser.h: event-filter-parser.c
 
-$(srcdir)/UnicodeData.txt:
-       $(AM_V_at)test -f $@ || $(WGET) -nv -O $@ https://dovecot.org/res/UnicodeData.txt
+$(UCD_DIR)/UnicodeData.txt:
+       $(AM_V_at)test -f $@ || $(WGET) -nv -O $@ $(UCD_URL)/UnicodeData.txt
 
-$(srcdir)/unicodemap.c: $(srcdir)/unicodemap.pl $(srcdir)/UnicodeData.txt
-       $(AM_V_GEN)$(PERL) $(srcdir)/unicodemap.pl < $(srcdir)/UnicodeData.txt > $@
+$(srcdir)/unicodemap.c: $(srcdir)/unicodemap.pl $(UCD_DIR)/UnicodeData.txt
+       $(AM_V_GEN)$(PERL) $(srcdir)/unicodemap.pl < $(UCD_DIR)/UnicodeData.txt > $@
 
 liblib_la_LIBADD = $(LIBUNWIND_LIBS)
 liblib_la_SOURCES = \

diff --git a/src/lib/ucd/.gitignore b/src/lib/ucd/.gitignore
new file mode 100644 (file)
index 0000000..d6b7ef3
--- /dev/null
+++ b/src/lib/ucd/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore