• R/O
  • SSH
  • HTTPS

tsukurimashou: コミット


コミットメタ情報

リビジョン668 (tree)
日時2017-11-19 14:15:29
作者mskala

ログメッセージ

all remaining stuff for 0.10 release - mostly build system patches

変更サマリ

差分

--- trunk/idsgrep/configure.ac (revision 667)
+++ trunk/idsgrep/configure.ac (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Configuration source for IDSgrep
5-# Copyright (C) 2012, 2013, 2014, 2015 Matthew Skala
5+# Copyright (C) 2012, 2013, 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -169,6 +169,15 @@
169169 AC_COPYRIGHT([Copyright (C) 2012, 2013, 2014 Matthew Skala])
170170 AC_SUBST([release_date],["March 27, 2014"])
171171 AM_SILENT_RULES
172+# this must be early so it will happen before depfiles
173+AC_CONFIG_COMMANDS([fix-makefile],
174+ ["$PERL" -i -pe \
175+'$_="" if /\$\(error This Makefile must be /;'\
176+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
177+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
178+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
179+ Makefile],
180+ [PERL=$PERL])
172181 #
173182 ############################################################################
174183 #
@@ -202,6 +211,9 @@
202211 AC_ARG_VAR([PERL],[Perl])
203212 AS_IF([test "x$PERL" = "x"],
204213 [AC_PATH_PROG([PERL],[perl])])
214+AC_ARG_VAR([UNICODE_URL],[Unicode data root])
215+AS_IF([test "x$UNICODE_URL" = "x"],
216+ [UNICODE_URL=http://unicode.org/Public/])
205217 AC_ARG_VAR([VALGRIND],[Valgrind])
206218 AS_IF([test "x$VALGRIND" = "x"],
207219 [AC_PATH_PROG([VALGRIND],[valgrind])])
@@ -225,8 +237,11 @@
225237 AM_CONDITIONAL([COND_PARASITE],
226238 [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
227239 AM_COND_IF([COND_PARASITE],
228- [AC_MSG_RESULT([yes])],
229- [AC_MSG_RESULT([no])])
240+ [AC_MSG_RESULT([yes])
241+ parasite=yes],
242+ [AC_MSG_RESULT([no])
243+ parasite=no])
244+AC_SUBST([parasite])
230245 #
231246 ############################################################################
232247 #
@@ -296,6 +311,13 @@
296311 #
297312 # User-settable options
298313 #
314+AC_ARG_ENABLE([download],
315+ [AS_HELP_STRING([--enable-download=[yes|no]],
316+ [automatically download Unicode data from UNICODE_URL [no]])],
317+ [],
318+ [enable_download=no])
319+AM_CONDITIONAL([COND_DOWNLOAD],[test '!' "$enable_download" = no])
320+#
299321 AC_ARG_ENABLE([gcov],
300322 [AS_HELP_STRING([--enable-gcov],
301323 [use Gcov to test the test suite])],
@@ -486,13 +508,6 @@
486508 #
487509 AC_SUBST([andt],[])
488510 AC_CONFIG_FILES([Makefile idsgrep.1 mitsuba.cfg])
489-AC_CONFIG_COMMANDS([fix-makefile],
490- ["$PERL" -i -pe \
491-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
492-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
493-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
494- Makefile],
495- [PERL=$PERL])
496511 TSU_BAD_PATHS
497512 AC_OUTPUT
498513 #
--- trunk/idsgrep/Makefile.am (revision 667)
+++ trunk/idsgrep/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile source for IDSgrep
5-# Copyright (C) 2012, 2013, 2014, 2015 Matthew Skala
5+# Copyright (C) 2012, 2013, 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@
3636 comma:=,
3737 percent=%
3838
39+$(error This Makefile must be edited by Perl code in config.status before use)
40+
3941 SHELL=$(if $(wildcard @KLEKNEV@),@KLEKNEV@,$(if \
4042 $(wildcard /bin/bash),/bin/bash,/bin/sh))
4143
@@ -178,12 +180,13 @@
178180
179181 STANDALONE_QVFG:=mitsuba.cls
180182 EXTRA_DIST:= \
181- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
182- gnugetopt.h idsgrep.tex idsgrep.bib widthtab.im
183+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
184+ gnugetopt.h idsgrep.tex idsgrep.bib widthtab.im \
185+ chise.eids idsgrep.pdf
183186
184187 STANDALONE_FPEVCGF:=
185188 dist_noinst_SCRIPTS:= \
186- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
189+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
187190 chise2eids cjkvi2eids ed22eids kvg2eids \
188191 cjkvi-ids.txt \
189192 $(GCOV_TESTS) test/vgneko test/rmgcda test/gcov
@@ -209,16 +212,24 @@
209212 # MAKE CLEAN
210213
211214 MOSTLYCLEANFILES = \
212- idsgrep.aux idsgrep.log idsgrep.blg idsgrep.bbl idsgrep.toc \
215+ idsgrep.aux idsgrep.log idsgrep.blg idsgrep.bbl idsgrep.toc idsgrep.out \
213216 *.bvec *.gcda *.gcno *.gcov
214217
215-CLEANFILES = chise.errs edict.eids kanjivg.eids tsukurimashou.eids
218+CLEANFILES = \
219+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF)) \
220+ chise.errs edict.eids kanjivg.eids tsukurimashou.eids \
221+ widthtab.h
216222
217223 DISTCLEANFILES = \
218- $(if $(VPATH),idsgrep.pdf chise.eids,) _stdint.h aminclude.am
224+ _stdint.h aminclude.am \
225+ EastAsianWidth.txt UnicodeData.txt
219226
220227 MAINTAINERCLEANFILES = idsgrep.pdf chise.eids
221228
229+distcleancheck_listfiles = \
230+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
231+ sh '{}' ';'
232+
222233 ############################################################################
223234
224235 # PDF DOCUMENTATION
@@ -285,16 +296,20 @@
285296 # BUILD THE WIDTH TABLE
286297
287298 download:
288- -wget -N -nd \
289- http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
290- -wget -N -nd \
291- http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
299+ -wget -N -nd @UNICODE_URL@UNIDATA/EastAsianWidth.txt
300+ -wget -N -nd @UNICODE_URL@UNIDATA/UnicodeData.txt
292301
302+if COND_DOWNLOAD
303+
304+EastAsianWidth.txt UnicodeData.txt: download
305+
306+endif
307+
293308 cook.o: widthtab.h
294309
295310 if COND_ICEMAP
296311 widthtab.h: widthtab.im $(ICEMAP) EastAsianWidth.txt UnicodeData.txt
297- $(ICEMAP) widthtab.im
312+ $(ICEMAP) $<
298313
299314 widthtab.c: widthtab.h
300315 endif
--- trunk/beikaitoru/configure.ac (revision 667)
+++ trunk/beikaitoru/configure.ac (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Configuration source for Beikaitoru
5-# Copyright (C) 2012, 2013, 2014, 2015 Matthew Skala
5+# Copyright (C) 2012, 2013, 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -206,9 +206,17 @@
206206 parallel-tests silent-rules])
207207 AC_CONFIG_SRCDIR([subfont.mp])
208208 AC_CONFIG_MACRO_DIR([m4])
209-AC_REVISION([$Id: configure.ac 4474 2015-12-03 12:33:00Z mskala $])
209+AC_REVISION([$Id: configure.ac 5785 2017-11-18 23:17:22Z mskala $])
210210 AC_COPYRIGHT([Copyright (C) 2013 Matthew Skala])
211211 AC_SUBST([release_date],["March 7, 2013"])
212+# this must be early so it will happen before depfiles
213+AC_CONFIG_COMMANDS([fix-makefile],
214+ ["$PERL" -i -pe \
215+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
216+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
217+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
218+ Makefile],
219+ [PERL=$PERL])
212220 AM_SILENT_RULES
213221 #
214222 ############################################################################
@@ -257,11 +265,13 @@
257265 [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
258266 AM_COND_IF([COND_PARASITE],
259267 [AC_MSG_RESULT([yes])
260- T1ASM=../t1asm/t1asm],
268+ T1ASM=../t1asm/t1asm
269+ parasite=yes],
261270 [AC_MSG_RESULT([no])
262271 AC_PATH_PROG([T1ASM],[t1asm])
263- ])
272+ parasite=no])
264273 AC_SUBST([T1ASM])
274+AC_SUBST([parasite])
265275 #
266276 ############################################################################
267277 #
@@ -322,13 +332,6 @@
322332 #
323333 AC_SUBST([andt],[])
324334 AC_CONFIG_FILES([Makefile])
325-AC_CONFIG_COMMANDS([fix-makefile],
326- ["$PERL" -i -pe \
327-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
328-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
329-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
330- Makefile],
331- [PERL=$PERL])
332335 TSU_BAD_PATHS
333336 AC_OUTPUT
334337 #
--- trunk/beikaitoru/Makefile.am (revision 667)
+++ trunk/beikaitoru/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile for Beikaitoru
5-# Copyright (C) 2012, 2013, 2014, 2015 Matthew Skala
5+# Copyright (C) 2012, 2013, 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -168,17 +168,19 @@
168168
169169 STANDALONE_QVFG:=fntbase.mp
170170 EXTRA_DIST:= \
171- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
172- $(wildcard $(mvp)/*.mp)
171+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
172+ $(wildcard $(mvp)/*.mp) beikaitoru.tex
173173
174174 STANDALONE_FPEVCGF:=mp2pf pe/fontlint.pe pe/rmo.pe
175175 dist_noinst_SCRIPTS:= \
176- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
177- nelson
176+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
177+ nelson pe/merge.pe occident.dat oriental.dat \
178+ pe/otf-100.pe pe/otf-150.pe pe/otf-200.pe pe/otf-300.pe \
179+ pe/otf-400.pe pe/otf-500.pe pe/otf-600.pe
178180
179181 dist_pdf_DATA = $(MAYBE_DOCS)
180182
181-dist_otf_DATA = otf/Beikaitoru156.otf
183+dist_otf_DATA =
182184 dist_ttf_DATA =
183185 dist_type1_DATA =
184186 dist_afm_DATA = $(patsubst %.pfb,%.afm,$(dist_type1_DATA))
@@ -188,11 +190,21 @@
188190 # MAKE CLEAN
189191
190192 MOSTLYCLEANFILES = \
191- *.afm *.otf *.pfb *.ttf
193+ pfb/*.afm pfb/*.pfb pfbtmp/* merged/* \
194+ beikaitoru.log beikaitoru.aux
192195
196+CLEANFILES = \
197+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF)) \
198+ $(filter-out otf/Beikaitoru156.otf,$(wildcard otf/*.otf))
199+
193200 DISTCLEANFILES = \
194- aminclude.am ffaetest.pe
201+ aminclude.am ffaetest.pe \
202+ */.dirstamp
195203
204+distcleancheck_listfiles = \
205+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
206+ sh '{}' ';'
207+
196208 ############################################################################
197209
198210 # DIRSTAMPS
@@ -234,7 +246,7 @@
234246 (cd $(1).tmp ; $$(expect_start)'$$(MPOST)' subfont.mp$$(expect_end) ) ; \
235247 if '$$(GREP)' -q '^! ' $(1).tmp/subfont.log ; then exit 1 ; fi ; \
236248 $$(TSU_V_NAPERL) \
237- '$$(PERL)' -CSD $$(mvp)/mp2pf $(1).tmp/subfont $$(TSU_V_REDIR) ; \
249+ '$$(PERL)' -CSD mp2pf $(1).tmp/subfont $$(TSU_V_REDIR) ; \
238250 (cd $(1).tmp ; '$$(realpath @T1ASM@)' -b subfont.p subfont.pfb ) ; \
239251 if test -r $(1).tmp/subfont.pfb \
240252 && '$$(GREP)' -q 'output files\? written' $(1).tmp/subfont.log; then \
@@ -248,9 +260,11 @@
248260 fi
249261
250262 pfb/$(1).pfb: pfbtmp/$(1).pfb pfb/.dirstamp pe/rmo.pe
263+ $$(AM_V_at)if test '!' -r pe/rmo.pe ; then \
264+ $$(MKDIR_P) pe ; cp $$(mvp)/pe/rmo.pe pe/ ; fi
251265 $$(AM_V_at)$$(TSU_V_RMO) \
252266 '$$(FONTANVIL)' -lang=ff -script \
253- $$(mvp)/pe/rmo.pe pfbtmp/$(1).pfb pfb/$(1).pfb \
267+ pe/rmo.pe pfbtmp/$(1).pfb pfb/$(1).pfb \
254268 $$(TSU_V_REDIR)
255269 endef
256270
@@ -408,9 +422,11 @@
408422 $(TSU_V_CP) cp $< $@
409423
410424 pe/rmo.pe: ../pe/rmo.pe
425+ $(AM_V_at)$(MKDIR_P) pe
411426 $(TSU_V_CP) cp $< $@
412427
413428 pe/fontlint.pe: ../pe/fontlint.pe
429+ $(AM_V_at)$(MKDIR_P) pe
414430 $(TSU_V_CP) cp $< $@
415431
416432 endif
--- trunk/icemap/configure.ac (revision 667)
+++ trunk/icemap/configure.ac (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Configuration source for Icemap
5-# Copyright (C) 2014, 2015 Matthew Skala
5+# Copyright (C) 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -126,6 +126,14 @@
126126 AC_COPYRIGHT([Copyright (C) 2014 Matthew Skala])
127127 AC_SUBST([release_date],["November 1, 2014"])
128128 AM_SILENT_RULES
129+# this must be early so it will happen before depfiles
130+AC_CONFIG_COMMANDS([fix-makefile],
131+ ["$PERL" -i -pe \
132+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
133+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
134+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
135+ Makefile],
136+ [PERL=$PERL])
129137 #
130138 ############################################################################
131139 #
@@ -162,6 +170,14 @@
162170 AM_COND_IF([COND_PARASITE],
163171 [AC_MSG_RESULT([yes])],
164172 [AC_MSG_RESULT([no])])
173+AM_CONDITIONAL([COND_PARASITE],
174+ [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
175+AM_COND_IF([COND_PARASITE],
176+ [AC_MSG_RESULT([yes])
177+ parasite=yes],
178+ [AC_MSG_RESULT([no])
179+ parasite=no])
180+AC_SUBST([parasite])
165181 #
166182 ############################################################################
167183 #
@@ -264,13 +280,6 @@
264280 #
265281 AC_SUBST([andt],[])
266282 AC_CONFIG_FILES([Makefile])
267-AC_CONFIG_COMMANDS([fix-makefile],
268- ["$PERL" -i -pe \
269-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
270-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
271-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
272- Makefile],
273- [PERL=$PERL])
274283 TSU_BAD_PATHS
275284 AC_OUTPUT
276285 #
--- trunk/icemap/Makefile.am (revision 667)
+++ trunk/icemap/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile source for Icemap
5-# Copyright (C) 2014, 2015 Matthew Skala
5+# Copyright (C) 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -112,12 +112,12 @@
112112
113113 STANDALONE_QVFG:=mitsuba.cls
114114 EXTRA_DIST:= \
115- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
116- inttest.c
115+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
116+ inttest.c icemap.tex
117117
118118 STANDALONE_FPEVCGF:=
119119 dist_noinst_SCRIPTS= \
120- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
120+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
121121 $(GCOV_TESTS) test/rmgcda test/gcov
122122
123123 bin_PROGRAMS = icemap
@@ -138,12 +138,20 @@
138138
139139 MOSTLYCLEANFILES =
140140
141-CLEANFILES =
141+CLEANFILES = \
142+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF)) \
143+ icemap.out icemap.aux icemap.log icemap.toc \
144+ icemap.idx icemap.ind icemap.ilg
142145
143-DISTCLEANFILES =
146+DISTCLEANFILES = \
147+ aminclude.am _stdint.h
144148
145149 MAINTAINERCLEANFILES =
146150
151+distcleancheck_listfiles = \
152+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
153+ sh '{}' ';'
154+
147155 ############################################################################
148156
149157 # PDF DOCUMENTATION
@@ -153,7 +161,7 @@
153161 $(AM_V_at)rm -f icemap.aux
154162 $(AM_V_at)I=1;$(TSU_V_TEXL) \
155163 '$(PDFLATEX)' $(mvp)/icemap.tex $(TSU_V_REDIR)
156- $(AM_V_at)makeindex $(mvp)/icemap.idx $(TSU_V_REDIR)
164+ $(AM_V_at)makeindex icemap.idx $(TSU_V_REDIR)
157165 $(AM_V_at)I=2;$(TSU_V_TEXL) \
158166 '$(PDFLATEX)' $(mvp)/icemap.tex $(TSU_V_REDIR)
159167 # export BIBINPUTS=$(mvp) ; bibtex icemap.aux $(TSU_V_REDIR) ; \
--- trunk/kleknev/configure.ac (revision 667)
+++ trunk/kleknev/configure.ac (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Configuration source for Kleknev
5-# Copyright (C) 2013, 2015 Matthew Skala
5+# Copyright (C) 2013, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -126,6 +126,14 @@
126126 AC_COPYRIGHT([Copyright (C) 2013 Matthew Skala])
127127 AC_SUBST([release_date],["March 7, 2013"])
128128 AM_SILENT_RULES
129+# this must be early so it will happen before depfiles
130+AC_CONFIG_COMMANDS([fix-makefile],
131+ ["$PERL" -i -pe \
132+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
133+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
134+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
135+ Makefile],
136+ [PERL=$PERL])
129137 #
130138 ############################################################################
131139 #
@@ -164,8 +172,11 @@
164172 AM_CONDITIONAL([COND_PARASITE],
165173 [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
166174 AM_COND_IF([COND_PARASITE],
167- [AC_MSG_RESULT([yes])],
168- [AC_MSG_RESULT([no])])
175+ [AC_MSG_RESULT([yes])
176+ parasite=yes],
177+ [AC_MSG_RESULT([no])
178+ parasite=no])
179+AC_SUBST([parasite])
169180 #
170181 ############################################################################
171182 #
@@ -252,13 +263,6 @@
252263 #
253264 AC_SUBST([andt],[])
254265 AC_CONFIG_FILES([Makefile])
255-AC_CONFIG_COMMANDS([fix-makefile],
256- ["$PERL" -i -pe \
257-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
258-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
259-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
260- Makefile],
261- [PERL=$PERL])
262266 TSU_BAD_PATHS
263267 AC_OUTPUT
264268 #
--- trunk/kleknev/Makefile.am (revision 667)
+++ trunk/kleknev/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile source for Kleknev
5-# Copyright (C) 2013, 2014, 2015 Matthew Skala
5+# Copyright (C) 2013, 2014, 2015, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -126,12 +126,11 @@
126126
127127 STANDALONE_QVFG:=
128128 EXTRA_DIST:= \
129- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG))
129+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG))
130130
131-
132131 STANDALONE_FPEVCGF:=
133132 dist_noinst_SCRIPTS:= \
134- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
133+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
135134 $(GCOV_TESTS)
136135
137136 bin_PROGRAMS = kleknev kleknev-argo
@@ -151,12 +150,18 @@
151150
152151 MOSTLYCLEANFILES =
153152
154-CLEANFILES =
153+CLEANFILES = \
154+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF))
155155
156-DISTCLEANFILES =
156+DISTCLEANFILES = \
157+ aminclude.am _stdint.h
157158
158159 MAINTAINERCLEANFILES =
159160
161+distcleancheck_listfiles = \
162+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
163+ sh '{}' ';'
164+
160165 ############################################################################
161166
162167 # PDF DOCUMENTATION
--- trunk/fontanvil/Makefile.am (revision 667)
+++ trunk/fontanvil/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile for FontAnvil
5-# Copyright (C) 2014, 2015, 2016 Matthew Skala
5+# Copyright (C) 2014, 2015, 2016, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,8 @@
3737 comma:=,
3838 percent=%
3939
40+$(error This Makefile must be edited by Perl code in config.status before use)
41+
4042 SHELL=$(if $(wildcard @KLEKNEV@),@KLEKNEV@,$(if \
4143 $(wildcard /bin/bash),/bin/bash,/bin/sh))
4244
@@ -322,7 +324,7 @@
322324
323325 STANDALONE_QVFG:=doc/mitsuba.cls
324326 EXTRA_DIST:= \
325- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
327+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
326328 COPYING README \
327329 Unicode/README.TXT \
328330 $(texfiles) doc/anvil.pdf doc/quixote-daumier.jpg doc/quixote-dore.jpg \
@@ -347,7 +349,7 @@
347349
348350 STANDALONE_FPEVCGF:=
349351 dist_noinst_SCRIPTS:= \
350- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
352+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
351353 $(TESTS) tools/dlunicode
352354 nodist_bin_SCRIPTS = \
353355 fontanvil/fontimage fontanvil/fontlint fontanvil/sfddiff
@@ -393,8 +395,14 @@
393395 # ICEMAP
394396
395397 download:
396- tools/dlunicode
398+ $(top_srcdir)/tools/dlunicode @UNICODE_URL@
397399
400+if COND_DOWNLOAD
401+
402+dat/Unihan_OtherMappings.txt: download
403+
404+endif
405+
398406 if COND_ICEMAP
399407
400408 %.h:%.im $(ICEMAP)
@@ -408,6 +416,9 @@
408416
409417 fontanvil/nonmactab.h: fontanvil/nonmactab.im \
410418 dat/texbase.dat dat/gb2312.dat dat/glyphlist.txt
419+ $(AM_V_at)if test '!' "x$(VPATH)" = "x" ; then \
420+ cp $(mvp)/dat/glyphlist.txt dat/ ; fi
421+ $(TSU_V_ICE)'$(ICEMAP)' -H$@ -C$(patsubst %.h,%.c,$@) $< $(TSU_V_REDIR)
411422 fontanvil/nonmactab.c: fontanvil/nonmactab.h
412423
413424 fontanvil/unicodelib.h: fontanvil/unicodelib.im
@@ -462,6 +473,8 @@
462473 doc/fontanvil.pdf: $(texfiles) doc/mitsuba.cls \
463474 doc/quixote-dore.jpg doc/quixote-daumier.jpg
464475 $(AM_V_at)rm -f fontanvil.aux
476+ $(AM_V_at)if test '!' "x$(VPATH)" = "x" ; then \
477+ cp $(mvp)/doc/*.tex $(mvp)/doc/*.jpg doc/ ; fi
465478 $(AM_V_at)I=1;$(TSU_V_TEXL) cd doc ; \
466479 '$(PDFLATEX)' fontanvil.tex $(TSU_V_REDIR)
467480 $(AM_V_at)cd doc ; makeindex fontanvil.idx $(TSU_V_REDIR)
@@ -477,6 +490,8 @@
477490 MOSTLYCLEANFILES = \
478491 *~ */*~ \
479492 fontanvil/fontimage fontanvil/fontlint fontanvil/sfddiff \
493+ doc/fontanvil.aux doc/fontanvil.log doc/fontanvil.toc doc/fontanvil.out \
494+ doc/fontanvil.idx doc/fontanvil.ilg doc/fontanvil.ind \
480495 test/atconfig \
481496 $(MO_FILES) $(noinst_FILES)
482497
@@ -484,16 +499,28 @@
484499 $(TSU_V_RM) 'ttmp'
485500 $(AM_V_at)rm -rf ttmp
486501
487-CLEANFILES =
502+CLEANFILES = \
503+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF))
488504
489505 DISTCLEANFILES = \
490506 aminclude.am _stdint.h \
491507 inc/fontanvil-config.h inc/stamp-h1 \
508+ $(filter-out dat/glyphlist.txt,$(wildcard dat/*)) \
492509 */.dirstamp
493510
511+distclean-local:
512+ $(TSU_V_RM) 'dat/apple'
513+ $(AM_V_at)rm -rf dat/apple
514+ $(TSU_V_RM) 'dat/adobe'
515+ $(AM_V_at)rm -rf dat/adobe
516+
494517 MAINTAINERCLEANFILES = \
495518 inc/fontanvil-config.h.in
496519
520+distcleancheck_listfiles = \
521+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
522+ sh '{}' ';'
523+
497524 ############################################################################
498525
499526 # KILL EMPTY FILES
@@ -531,6 +558,7 @@
531558 if COND_PARASITE
532559
533560 doc/mitsuba.cls: ../mitsuba/mitsuba.cls
561+ $(MKDIR_P) doc
534562 $(TSU_V_CP) cp $< $@
535563
536564 m4/ax_add_am_macro.m4: ../m4/ax_add_am_macro.m4
@@ -567,6 +595,7 @@
567595 $(TSU_V_CP) cp $< $@
568596
569597 dat/UnicodeData.txt: $(wildcard ../idsgrep/UnicodeData.txt)
598+ $(MKDIR_P) dat
570599 $(TSU_V_CP) if test -s ../idsgrep/UnicodeData.txt ; \
571600 then cp ../idsgrep/UnicodeData.txt $@ ; fi
572601
--- trunk/fontanvil/configure.ac (revision 667)
+++ trunk/fontanvil/configure.ac (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Configuration source for FontAnvil
5-# Copyright (C) 2014, 2015, 2016 Matthew Skala
5+# Copyright (C) 2014, 2015, 2016, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -141,8 +141,21 @@
141141 AC_REVISION([$Id: configure.ac 2831 2014-03-02 07:18:54Z mskala $])
142142 AC_COPYRIGHT([Copyright (C) 2014, 2015 Matthew Skala])
143143 AC_SUBST([release_date],["December 8, 2015"])
144+AC_CONFIG_COMMANDS([fix-makefile],
145+ [if test '!' "x$ICEMAP" = "x" ; then "$PERL" -i -pe \
146+'s/^(@<:@a-z\-@:>@+:) (\$\(BUILT_SOURCES\))/'\
147+'\1\n\t@\$(MAKE) -q \2 || \$(MAKE) \$(AM_MAKEFLAGS) \2/;' Makefile ; fi ; \
148+"$PERL" -i -pe \
149+'$_="" if /\$\(error This Makefile must be /;'\
150+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
151+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
152+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
153+ Makefile],
154+ [PERL=$PERL
155+ ICEMAP=$ICEMAP])
144156 AM_SILENT_RULES
145157 AC_USE_SYSTEM_EXTENSIONS
158+# this must be early so it will happen before depfiles
146159 #
147160 ############################################################################
148161 #
@@ -205,6 +218,9 @@
205218 AC_ARG_VAR([PERL],[Perl])
206219 AS_IF([test "x$PERL" = "x"],
207220 [AC_PATH_PROG([PERL],[perl])])
221+AC_ARG_VAR([UNICODE_URL],[Unicode data root])
222+AS_IF([test "x$UNICODE_URL" = "x"],
223+ [UNICODE_URL=http://unicode.org/Public/])
208224 AC_PATH_PROG([UNZIP],[unzip],[unzip])
209225 #
210226 AC_ARG_VAR([VALGRIND],[Valgrind])
@@ -243,8 +259,11 @@
243259 [AC_MSG_RESULT([yes])
244260 AS_IF([test "x$ICEMAP" = "x"],
245261 [AC_MSG_WARN([Depending on locally-built Icemap])
246- ICEMAP=$PWD/../icemap/icemap])],
247- [AC_MSG_RESULT([no])])
262+ ICEMAP=$PWD/../icemap/icemap])
263+ parasite=yes],
264+ [AC_MSG_RESULT([no])
265+ parasite=no])
266+AC_SUBST([parasite])
248267 AS_IF([test "x$ICEMAP" = "x"],[ICEMAP=no])
249268 AM_CONDITIONAL([COND_ICEMAP],[test '!' "x$ICEMAP" = "xno"])
250269 #
@@ -506,6 +525,12 @@
506525 AS_IF([test "x$enable_debug" = xyes],
507526 [CFLAGS="$CFLAGS -g -O0" ; CPPFLAGS="$CPPFLAGS -g -O0"])
508527 #
528+AC_ARG_ENABLE([download],
529+ [AS_HELP_STRING([--enable-download=[yes|no]],
530+ [automatically download Unicode data from UNICODE_URL [no]])],
531+ [],
532+ [enable_download=no])
533+#
509534 AC_ARG_WITH([valgrind],
510535 [AS_HELP_STRING([--with-valgrind],
511536 [use Valgrind for tests if available])],
@@ -521,6 +546,8 @@
521546 [],[tsu_colour=no])
522547 AM_CONDITIONAL([COND_COLOUR],[test '!' "$tsu_colour" = no])
523548 #
549+AM_CONDITIONAL([COND_DOWNLOAD],[test '!' "$enable_download" = no])
550+#
524551 AS_IF([test "x$enable_silent_rules" = "x"],
525552 [enable_silent_rules=yes
526553 AM_DEFAULT_VERBOSITY=0])
@@ -538,17 +565,6 @@
538565 AC_SUBST([HOST],["$host"])
539566 AC_SUBST([MACAPP])
540567 AC_CONFIG_FILES([Makefile doc/fontanvil.1])
541-AC_CONFIG_COMMANDS([fix-makefile],
542- [if test '!' "x$ICEMAP" = "x" ; then "$PERL" -i -pe \
543-'s/^(@<:@a-z\-@:>@+:) (\$\(BUILT_SOURCES\))/'\
544-'\1\n\t@\$(MAKE) -q \2 || \$(MAKE) \$(AM_MAKEFLAGS) \2/;' Makefile ; fi ; \
545-"$PERL" -i -pe \
546-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
547-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
548-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
549- Makefile],
550- [PERL=$PERL
551- ICEMAP=$ICEMAP])
552568 TSU_BAD_PATHS
553569 AC_OUTPUT
554570 #
--- trunk/configure.ac (revision 667)
+++ trunk/configure.ac (revision 668)
@@ -199,10 +199,26 @@
199199 AC_CONFIG_SRCDIR([hamlog/hamlog])
200200 AC_CONFIG_HEADERS([config.h])
201201 AC_CONFIG_MACRO_DIR([m4])
202-AC_REVISION([$Id: configure.ac 5745 2017-11-17 03:12:50Z mskala $])
202+AC_REVISION([$Id: configure.ac 5782 2017-11-18 20:45:53Z mskala $])
203203 AC_COPYRIGHT([Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017 Matthew Skala])
204204 AC_SUBST([release_date],["November 17, 2017"])
205205 AM_SILENT_RULES
206+# this must be early so it will happen before depfiles
207+AC_CONFIG_COMMANDS([fix-makefile],
208+ ["$PERL" -i -pe \
209+'s/ZZZZHACKZZZZ\s*=\s*//;$_="" if /\$\(error This Makefile must be /;'\
210+'s#(\$\(AUTOMAKE\) --foreign( Makefile)?)(?! && ./config)#'\
211+'\1 && \$(SHELL) ./config.status fix-makefile#;'\
212+'s#config\.status \$\@ \$\(am__depfiles_maybe\)#'\
213+'config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;'\
214+'s#TESTS = #TESTS = \$(otf_DATA) #;'\
215+'s#^all: config.h#all: kill-empty config.h#;'\
216+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
217+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
218+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
219+ Makefile
220+ rm -f pfb-stamp* chl-stamp],
221+ [PERL=$PERL])
206222 #
207223 ############################################################################
208224 #
@@ -247,6 +263,9 @@
247263 AS_IF([unames=`uname -s` ; test "x$unames" = 'xDarwin'],
248264 [AC_PATH_PROGS([PROLOG],[swipl eclipse gprolog],[])],
249265 [AC_PATH_PROGS([PROLOG],[pl swipl eclipse gprolog],[])])
266+AC_ARG_VAR([UNICODE_URL],[Unicode data root])
267+AS_IF([test "x$UNICODE_URL" = "x"],
268+ [UNICODE_URL=http://unicode.org/Public/])
250269 AC_ARG_VAR([XDVIPDFMX],[xdvipdfmx])
251270 AS_IF([test "x$XDVIPDFMX" = "x"],
252271 [AC_PATH_PROG([XDVIPDFMX],[xdvipdfmx])])
@@ -362,6 +381,11 @@
362381 [turn off PDF documentation])],
363382 [],
364383 [enable_docs=yes])
384+AC_ARG_ENABLE([download],
385+ [AS_HELP_STRING([--enable-download=[yes|no]],
386+ [automatically download Unicode data from UNICODE_URL [no]])],
387+ [],
388+ [enable_download=no])
365389 AC_ARG_ENABLE([ff-debug],
366390 [AS_HELP_STRING([--disable-ff-debug],
367391 [turn off FontAnvil debuggery warning])],
@@ -427,6 +451,8 @@
427451 AM_CONDITIONAL([COND_DOCS],[test '!' "$enable_docs" = no])
428452 AC_SUBST([enable_docs])
429453 #
454+AM_CONDITIONAL([COND_DOWNLOAD],[test '!' "$enable_download" = no])
455+#
430456 AC_SUBST([enable_ot_features])
431457 #
432458 AC_CONFIG_SUBDIRS([kleknev icemap fontanvil beikaitoru genjimon idsgrep ocr])
@@ -754,21 +780,6 @@
754780 #
755781 AC_SUBST([andt],[])
756782 AC_CONFIG_FILES([Makefile])
757-AC_CONFIG_COMMANDS([fix-makefile],
758- ["$PERL" -i -pe \
759-'s/ZZZZHACKZZZZ\s*=\s*//;$_="" if /\$\(error This Makefile must be /;'\
760-'s#(\$\(AUTOMAKE\) --foreign( Makefile)?)(?! && ./config)#'\
761-'\1 && \$(SHELL) ./config.status fix-makefile#;'\
762-'s#config\.status \$\@ \$\(am__depfiles_maybe\)#'\
763-'config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;'\
764-'s#TESTS = #TESTS = \$(otf_DATA) #;'\
765-'s#^all: config.h#all: kill-empty config.h#;'\
766-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
767-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
768-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
769- Makefile
770- rm -f pfb-stamp* chl-stamp],
771- [PERL=$PERL])
772783 AC_OUTPUT
773784 #
774785 ############################################################################
@@ -802,6 +813,8 @@
802813 [no],[$can_ffdebug])
803814 TSU_TABLE_LINE([build-system hacking ],[$enable_build_hacking],
804815 [no],[$can_bshack])
816+TSU_TABLE_LINE([Unicode auto-download ],[$enable_download],
817+ [$enable_download],[yes])
805818 AS_ECHO([])
806819 AS_ECHO_N(["Character selection "])
807820 TSU_COLOURISE([$enable_chars],[6])AS_ECHO([])
@@ -1022,9 +1035,12 @@
10221035 AS_ECHO(["possibilities. The download target is recursive and running it from"])
10231036 AS_ECHO(["the top directory will also attempt to fetch dictionary data for IDSgrep."])
10241037 AS_ECHO(["Run make download in the fontanvil/ directory to only fetch what is"])
1025- AS_ECHO(["required by FontAnvil. This step will NOT be taken automatically, on"])
1026- AS_ECHO(["the principle that build systems should never make network connections"])
1027- AS_ECHO(["without a specific user request to do so."])])
1038+ AS_ECHO(["required by FontAnvil. This step will NOT be taken automatically unless"])
1039+ AS_ECHO(["you specify the --enable-download=yes option, on the principle that build"])
1040+ AS_ECHO(["systems should never make network connections without a specific user"])
1041+ AS_ECHO(["request to do so. Use the UNICODE_URL environment variable to specify"])
1042+ AS_ECHO(["an alternate URL for the source of the files and be a better neighbour"])
1043+ AS_ECHO(["to the Unicode Consortium."])])
10281044
10291045 AS_IF([test "x$has_bad_paths" = "xyes"],
10301046 [AS_ECHO([])
--- trunk/genjimon/configure.ac (revision 667)
+++ trunk/genjimon/configure.ac (revision 668)
@@ -197,10 +197,18 @@
197197 parallel-tests silent-rules])
198198 AC_CONFIG_SRCDIR([genjimon-black.mp])
199199 AC_CONFIG_MACRO_DIR([m4])
200-AC_REVISION([$Id: configure.ac 4474 2015-12-03 12:33:00Z mskala $])
200+AC_REVISION([$Id: configure.ac 5785 2017-11-18 23:17:22Z mskala $])
201201 AC_COPYRIGHT([Copyright (C) 2011, 2012 Matthew Skala])
202202 AC_SUBST([release_date],["March 7, 2013"])
203203 AM_SILENT_RULES
204+# this must be early so it will happen before depfiles
205+AC_CONFIG_COMMANDS([fix-makefile],
206+ ["$PERL" -i -pe \
207+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
208+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
209+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
210+ Makefile],
211+ [PERL=$PERL])
204212 #
205213 ############################################################################
206214 #
@@ -248,11 +256,13 @@
248256 [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
249257 AM_COND_IF([COND_PARASITE],
250258 [AC_MSG_RESULT([yes])
251- T1ASM=../t1asm/t1asm],
259+ T1ASM=../t1asm/t1asm
260+ parasite=yes],
252261 [AC_MSG_RESULT([no])
253262 AC_PATH_PROG([T1ASM],[t1asm])
254- ])
263+ parasite=no])
255264 AC_SUBST([T1ASM])
265+AC_SUBST([parasite])
256266 #
257267 ############################################################################
258268 #
@@ -304,13 +314,6 @@
304314 #
305315 AC_SUBST([andt],[])
306316 AC_CONFIG_FILES([Makefile])
307-AC_CONFIG_COMMANDS([fix-makefile],
308- ["$PERL" -i -pe \
309-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
310-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
311-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
312- Makefile],
313- [PERL=$PERL])
314317 TSU_BAD_PATHS
315318 AC_OUTPUT
316319 #
--- trunk/genjimon/Makefile.am (revision 667)
+++ trunk/genjimon/Makefile.am (revision 668)
@@ -2,7 +2,7 @@
22
33 #
44 # Makefile for Genjimon
5-# Copyright (C) 2011, 2012, 2014 Matthew Skala
5+# Copyright (C) 2011, 2012, 2014, 2017 Matthew Skala
66 #
77 # This program is free software: you can redistribute it and/or modify
88 # it under the terms of the GNU General Public License as published by
@@ -158,12 +158,12 @@
158158
159159 STANDALONE_QVFG:=fntbase.mp genjimon.mp mitsuba.cls
160160 EXTRA_DIST:= \
161- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
161+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
162162 genfont.mp $(wildcard genjimon-*.mp) genjimon.tex
163163
164164 STANDALONE_FPEVCGF:=fontlint.pe mp2pf
165165 dist_noinst_SCRIPTS:= \
166- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
166+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
167167 makettf.pe
168168
169169 dist_pdf_DATA = $(MAYBE_DOCS)
@@ -181,8 +181,16 @@
181181 *.pfb *.sfd *.ttf \
182182 genjimon.aux genjimon.log genjimon.out genjimon.pdf
183183
184-DISTCLEANFILES = aminclude.am
184+CLEANFILES = \
185+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF))
185186
187+DISTCLEANFILES = \
188+ aminclude.am
189+
190+distcleancheck_listfiles = \
191+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
192+ sh '{}' ';'
193+
186194 ############################################################################
187195
188196 # POSTSCRIPT FONTS
@@ -197,7 +205,7 @@
197205 (cd $*.tmp ; $(expect_start)'$(MPOST)' $*.mp$(expect_end) ) ; \
198206 if '$(GREP)' -q '^! ' $*.tmp/$*.log ; then exit 1 ; fi ; \
199207 $(TSU_V_NAPERL) \
200- '$(PERL)' -CSD $(mvp)/mp2pf $*.tmp/$* $(TSU_V_REDIR) ; \
208+ '$(PERL)' -CSD mp2pf $*.tmp/$* $(TSU_V_REDIR) ; \
201209 (cd $*.tmp ; '$(realpath @T1ASM@)' -b $*.p $*.pfb ) ; \
202210 if test -r $*.tmp/$*.pfb \
203211 && '$(GREP)' -q 'output files\? written' $*.tmp/$*.log; then \
--- trunk/Makefile.am (revision 667)
+++ trunk/Makefile.am (revision 668)
@@ -54,6 +54,7 @@
5454 SHELL=$(if $(wildcard @KLEKNEV@),@KLEKNEV@,$(if \
5555 $(wildcard /bin/bash),/bin/bash,/bin/sh))
5656 SUBDIRS = $(EARLY_PARASITES) . $(PARASITES)
57+DIST_SUBDIRS = . $(ALL_EARLY_PARASITES) $(ALL_PARASITES)
5758
5859 ############################################################################
5960
@@ -306,6 +307,10 @@
306307 aminclude.am chars.lst hamlog/config.hl doc/version.tex \
307308 */.dirstamp
308309
310+distcleancheck_listfiles = \
311+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
312+ sh '{}' ';'
313+
309314 ############################################################################
310315
311316 # KILL EMPTY FILES AND RECORD BUILD START
@@ -489,6 +494,15 @@
489494 'parasite_available(P),want_parasite(P)' \
490495 hamlog/config.hl $(mvp)/hamlog/select.hl $(HAMLOG_AFTER)` \
491496 >> makefile-vars.inc
497+ $(AM_V_at)echo ALL_EARLY_PARASITES=`$(HAMLOG) 'P' \
498+ 'early_parasite_available(P)' \
499+ hamlog/config.hl $(mvp)/hamlog/select.hl \
500+ $(HAMLOG_AFTER) | sort -r` \
501+ >> makefile-vars.inc
502+ $(AM_V_at)echo ALL_PARASITES=`$(HAMLOG) 'P' \
503+ 'parasite_available(P)' \
504+ hamlog/config.hl $(mvp)/hamlog/select.hl $(HAMLOG_AFTER)` \
505+ >> makefile-vars.inc
492506 $(AM_V_at)echo SHORT_STYLES=`$(HAMLOG) 'want_style_short(F,S,W,P)' \
493507 'want_style_short(F,S,W,P)' \
494508 hamlog/config.hl $(mvp)/hamlog/select.hl $(HAMLOG_AFTER) \
--- trunk/ocr/configure.ac (revision 667)
+++ trunk/ocr/configure.ac (revision 668)
@@ -192,10 +192,18 @@
192192 parallel-tests silent-rules])
193193 AC_CONFIG_SRCDIR([msk-ocra.mp])
194194 AC_CONFIG_MACRO_DIR([m4])
195-AC_REVISION([$Id: configure.ac 4474 2015-12-03 12:33:00Z mskala $])
195+AC_REVISION([$Id: configure.ac 5785 2017-11-18 23:17:22Z mskala $])
196196 AC_COPYRIGHT([public domain])
197197 AC_SUBST([release_date],["March 7, 2013"])
198198 AM_SILENT_RULES
199+# this must be early so it will happen before depfiles
200+AC_CONFIG_COMMANDS([fix-makefile],
201+ ["$PERL" -i -pe \
202+'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
203+'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
204+'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
205+ Makefile],
206+ [PERL=$PERL])
199207 #
200208 ############################################################################
201209 #
@@ -243,11 +251,13 @@
243251 [grep Tsukurimashou ../Makefile > /dev/null 2> /dev/null])
244252 AM_COND_IF([COND_PARASITE],
245253 [AC_MSG_RESULT([yes])
246- T1ASM=../t1asm/t1asm],
254+ T1ASM=../t1asm/t1asm
255+ parasite=yes],
247256 [AC_MSG_RESULT([no])
248257 AC_PATH_PROG([T1ASM],[t1asm])
249- ])
258+ parasite=no])
250259 AC_SUBST([T1ASM])
260+AC_SUBST([parasite])
251261 #
252262 ############################################################################
253263 #
@@ -308,13 +318,6 @@
308318 #
309319 AC_SUBST([andt],[])
310320 AC_CONFIG_FILES([Makefile])
311-AC_CONFIG_COMMANDS([fix-makefile],
312- ["$PERL" -i -pe \
313-'s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#'\
314-'\t\$(TSU_V_RM) '"'"'\3'"'"' \$(TSU_V_CHOPPER)\n'\
315-'\t-\$(A''M_V_at)\1rm -\2f \3#;' \
316- Makefile],
317- [PERL=$PERL])
318321 TSU_BAD_PATHS
319322 AC_OUTPUT
320323 #
--- trunk/ocr/Makefile.am (revision 667)
+++ trunk/ocr/Makefile.am (revision 668)
@@ -149,13 +149,13 @@
149149
150150 STANDALONE_QVFG:=fntbase.mp
151151 EXTRA_DIST:= \
152- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
152+ $(if $(filter no,@parasite@),$(STANDALONE_QVFG) ) \
153153 $(wildcard $(mvp)/*.mp) \
154154 ocr.tex ocra.fea ocrb.fea
155155
156156 STANDALONE_FPEVCGF:=fontlint.pe mp2pf
157157 dist_noinst_SCRIPTS:= \
158- $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_FPEVCGF)) \
158+ $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
159159 ocra-no.pe ocra-yes.pe ocrb-no.pe ocrb-yes.pe ocrbnames.pe rmo.pe
160160
161161 dist_pdf_DATA = $(MAYBE_DOCS)
@@ -176,9 +176,16 @@
176176 *.afm *.otf *.pfb *.rmo *.ttf \
177177 ocr.aux ocr.log ocr.out ocr.pdf
178178
179+CLEANFILES = \
180+ $(if $(filter yes,@parasite@),$(STANDALONE_QVFG) $(STANDALONE_FPEVCGF))
181+
179182 DISTCLEANFILES = \
180183 aminclude.am ffaetest.pe
181184
185+distcleancheck_listfiles = \
186+ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
187+ sh '{}' ';'
188+
182189 ############################################################################
183190
184191 # POSTSCRIPT FONTS
@@ -193,7 +200,7 @@
193200 (cd $*.tmp ; $(expect_start)'$(MPOST)' $*.mp$(expect_end) ) ; \
194201 if '$(GREP)' -q '^! ' $*.tmp/$*.log ; then exit 1 ; fi ; \
195202 $(TSU_V_NAPERL) \
196- '$(PERL)' -CSD $(mvp)/mp2pf $*.tmp/$* $(TSU_V_REDIR) ; \
203+ '$(PERL)' -CSD mp2pf $*.tmp/$* $(TSU_V_REDIR) ; \
197204 (cd $*.tmp ; '$(realpath @T1ASM@)' -b $*.p $*.pfb ) ; \
198205 if test -r $*.tmp/$*.pfb \
199206 && '$(GREP)' -q 'output files\? written' $*.tmp/$*.log; then \
旧リポジトリブラウザで表示