diff -r 2e7485bc264d -r c94691a451ca Makefile --- a/Makefile Wed Nov 09 22:23:26 2016 +0200 +++ b/Makefile Wed Nov 09 22:23:59 2016 +0200 @@ -395,20 +395,25 @@ ################################################################ # Word frequency statistic. -define FREQLIST_MACRO +define FREQLIST_FREQ_MACRO FREQLIST_OPT += -freq:freq:$(1)=$(2) FREQLIST_DEP += $(2) endef +define FREQLIST_VAR_MACRO +FREQLIST_OPT += -freq:var:$(1)=$(2) +FREQLIST_DEP += $(2) +endef FREQLIST_OPT := FREQLIST_DEP := # For dictd and anki. -$(eval $(call FREQLIST_MACRO,GSL,wordlist/gsl.freq)) -$(eval $(call FREQLIST_MACRO,AWL,wordlist/awl.freq)) -$(eval $(call FREQLIST_MACRO,NGSL,wordlist/ngsl.freq)) -$(eval $(call FREQLIST_MACRO,NAWL,wordlist/nawl.freq)) -FREQLIST_OPT += -freq:var:VOA=dist/wordlist/voa.list -FREQLIST_DEP += dist/wordlist/voa.list +$(eval $(call FREQLIST_FREQ_MACRO,GSL,wordlist/gsl.freq)) +$(eval $(call FREQLIST_FREQ_MACRO,AWL,wordlist/awl.freq)) +$(eval $(call FREQLIST_FREQ_MACRO,NGSL,wordlist/ngsl.freq)) +$(eval $(call FREQLIST_FREQ_MACRO,NAWL,wordlist/nawl.freq)) +$(eval $(call FREQLIST_VAR_MACRO,VOA,dist/wordlist/voa.list)) +$(eval $(call FREQLIST_VAR_MACRO,BSL,wordlist/bsl.var)) +$(eval $(call FREQLIST_VAR_MACRO,TSL,wordlist/tsl.var)) FREQ_DEP := FREQ_FILTER :=