diff -r 6d4a074cea27 -r 2d488cfc4c0c Makefile --- a/Makefile Tue Nov 08 18:12:50 2016 +0200 +++ b/Makefile Tue Nov 08 19:01:27 2016 +0200 @@ -395,6 +395,9 @@ ################################################################ # Word frequency statistic. +# For dictd and anki. +FREQLIST_OPT := -freq:freq:GSL=wordlist/gsl.freq -freq:freq:AWL=wordlist/awl.freq -freq:freq:NGSL=wordlist/ngsl.freq -freq:freq:NAWL=wordlist/nawl.freq + FREQ_DEP := FREQ_FILTER := @@ -482,18 +485,22 @@ # -B suppress __pycache__ dir -dist/dictd/gadict_en-ru.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py | dist/dictd/ +dist/dictd/gadict_en-ru+uk.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/ + python3 -B py/gadict_c5.py $(FREQLIST_OPT) $< $@ + echo "gadict En-Ru+Uk"> dist/dictd/gadict_en-ru+uk.c5.name + +dist/dictd/gadict_en-ru.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/ python3 -B py/gadict_c5.py $< $@ -lang:ru echo "gadict En-Ru"> dist/dictd/gadict_en-ru.c5.name -dist/dictd/gadict_en-uk.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py | dist/dictd/ +dist/dictd/gadict_en-uk.c5: gadict_en-ru+uk.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/ python3 -B py/gadict_c5.py $< $@ -lang:uk echo "gadict En-Uk"> dist/dictd/gadict_en-uk.c5.name -dist/dictd/gadict_voa.c5: gadict_voa.gadict py/gadict.py py/gadict_c5.py | dist/dictd/ +dist/dictd/gadict_voa.c5: gadict_voa.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/ python3 -B py/gadict_c5.py $< $@ -lang:en -dist/dictd/%.c5: %.gadict py/gadict.py py/gadict_c5.py | dist/dictd/ +dist/dictd/%.c5: %.gadict py/gadict.py py/gadict_c5.py $(MAKEFILE_LIST) | dist/dictd/ python3 -B py/gadict_c5.py $< $@ dist/dictd/: @@ -506,10 +513,10 @@ anki: $(SRS_ANKI_FILES) dist/srs/%.apkg: %.gadict %.del py/gadict.py py/gadict_srs_anki.py $(MAKEFILE_LIST) | dist/srs/ - PYTHONPATH=/usr/share/anki: python -B py/gadict_srs_anki.py $< $@ + PYTHONPATH=/usr/share/anki: python -B py/gadict_srs_anki.py $(FREQLIST_OPT) $< $@ dist/srs/%.apkg: %.gadict py/gadict.py py/gadict_srs_anki.py $(MAKEFILE_LIST) | dist/srs/ - PYTHONPATH=/usr/share/anki: python -B py/gadict_srs_anki.py $< $@ + PYTHONPATH=/usr/share/anki: python -B py/gadict_srs_anki.py $(FREQLIST_OPT) $< $@ dist/srs/gadict_en-ru+uk.tab.txt: gadict_en-ru+uk.gadict py/gadict.py py/gadict_srs_tab.py $(MAKEFILE_LIST) | dist/srs/ python3 -B py/gadict_srs_tab.py $< $@ -lang:ru,uk