X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=blobdiff_plain;f=Makefile;h=cc806b88a1f914a01542929e1666b7c394885048;hp=91446c131dae2e11947b37deae01d8917427699d;hb=456757e5be5ba2aadd7e90601d548ce52ff34cde;hpb=adbd0c3d3296ead6c49b4f13012aca4a558efc7f

diff --git a/Makefile b/Makefile
index 91446c1..cc806b8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ all: $(foreach l, $(levels), final/english-words.$(l)) \
 
 .PHONY: clean
 clean:
-	rm -f working/* $(programs) r/varcon/*.lst r/varcon/variant.tab r/mwords/*.lst r/alt12dicts/*.lst r/ispell/all.* r/pos/word.lst r/uk-freq-class/uk.?? r/census/*.lst
+	rm -f working/* $(programs) r/varcon/*.lst r/varcon/variant.tab r/mwords/*.lst r/alt12dicts/*.lst r/ispell/all.* r/pos/word.lst r/uk-freq-class/uk.?? r/census/*.lst debug/*
+	make -C speller clean
 
 #
 # README
@@ -67,13 +68,13 @@ working/all.lst working/all.lst-unfiltered: \
   src/make-all.lst $(shell find l/supplement/ l/add-affixes/ l/add-possessive -type l)
 	$<
 
-working/variant_0.lst working/variant_1.lst working/variant_2.lst: \
+working/variant_1.lst working/variant_2.lst working/variant_3.lst: \
   src/make-variant.lst         r/alt12dicts/variant-also.lst \
   r/alt12dicts/variant-yes.lst r/alt12dicts/variant-maybe.lst \
   r/infl/variant_0.lst  r/infl/variant_1.lst  r/infl/variant_2.lst \
   r/varcon/british.lst r/varcon/british_z.lst r/varcon/canadian.lst \
   r/varcon/w_variant-amer.lst r/varcon/w_variant-nonamer.lst  \
-  r/special/variant_0  r/special/variant_1  r/special/variant_2 \
+  r/special/variant_1  r/special/variant_2  r/special/variant_3 \
   r/special/never-variant
 	touch working/possessive-also.lst
 	$<
@@ -81,7 +82,7 @@ working/variant_0.lst working/variant_1.lst working/variant_2.lst: \
 	$(MAKE) working/possessive-also.lst
 	$<
 
-working/contractions.lst: src/make-contractions.lst working/words.80
+working/contractions.lst: src/make-contractions.lst working/words.95 working/proper-names.lst working/abbreviations.lst
 	$<
 
 working/known-upper.lst: src/make-known-upper.lst l/upper/* \
@@ -123,8 +124,8 @@ working/with-accents.lst working/without-accents.lst: \
 final/special-roman-numerals.35: r/special/roman-numerals
 	cp $< $@
 
-final/special-hacker.50: l/hacker/*
-	cat $^ | sort -u > $@
+final/special-hacker.50: l/hacker/* r/special/hacker-exclude
+	cat l/hacker/* | sort -u | comm -23 - r/special/hacker-exclude > $@
 
 #
 # Modified form of Raw Lists
@@ -155,6 +156,12 @@ r/alt12dicts/5desk.lst: r/alt12dicts/5desk.txt src/clean-alan-list
 r/alt12dicts/signature.lst: r/alt12dicts/signature.txt src/clean-alan-list
 	src/clean-alan-list < $< > $@
 
+r/alt12dicts/neol-50.lst r/alt12dicts/neol-80.lst: r/alt12dicts/neol2016.txt
+	src/proc-neol
+
+l/supplement/50/neol-50.lst: r/alt12dicts/neol-50.lst
+l/supplement/80/neol-80.lst: r/alt12dicts/neol-80.lst
+
 #
 #r/ispell/all.0 r/ispell/all.1: r/ispell/all.%: \
 #  src/make-ispell-all.lst 
@@ -219,3 +226,13 @@ deps: .symbolic-deps
 	src/make-symbolic-deps
 -include .symbolic-deps
 
+#
+# Sanity checks and related
+#
+scowl.db: final/*
+	-rm scowl.db
+	sql/create.sh
+
+test: scowl.db
+	make -C speller hunspell
+	sql/test