• R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision732 (tree)
Time2021-06-26 07:50:48
Authormskala

Log Message

clean up handling of copied files in standalone/parasite builds

Change Summary

Incremental Difference

--- trunk/beikaitoru/Makefile.am (revision 731)
+++ trunk/beikaitoru/Makefile.am (revision 732)
@@ -186,6 +186,7 @@
186186 nelson pe/merge.pe occident.dat oriental.dat \
187187 pe/otf-100.pe pe/otf-150.pe pe/otf-200.pe pe/otf-300.pe \
188188 pe/otf-400.pe pe/otf-500.pe pe/otf-600.pe
189+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
189190
190191 dist_pdf_DATA = $(MAYBE_DOCS)
191192
@@ -380,6 +381,8 @@
380381 TESTS = $(dist_otf_DATA) $(dist_ttf_DATA) $(dist_type1_DATA)
381382 LOG_COMPILER = '$(FONTANVIL)' -lang=ff -script pe/fontlint.pe
382383
384+$(foreach test,$(TESTS),$(test).log ): $(mvp)/pe/fontlint.pe
385+
383386 ############################################################################
384387
385388 # AUTOMAKE'S RULES WILL GO HERE
--- trunk/beikaitoru/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/beikaitoru/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
--- trunk/fontanvil/Makefile.am (revision 731)
+++ trunk/fontanvil/Makefile.am (revision 732)
@@ -358,6 +358,7 @@
358358 dist_noinst_SCRIPTS:= \
359359 $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
360360 $(TESTS) tools/dlunicode
361+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
361362 nodist_bin_SCRIPTS = \
362363 fontanvil/fontimage fontanvil/fontlint fontanvil/sfddiff
363364
--- trunk/fontanvil/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/fontanvil/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
--- trunk/genjimon/Makefile.am (revision 731)
+++ trunk/genjimon/Makefile.am (revision 732)
@@ -174,6 +174,7 @@
174174 dist_noinst_SCRIPTS:= \
175175 $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
176176 makettf.pe
177+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
177178
178179 dist_pdf_DATA = $(MAYBE_DOCS)
179180
@@ -298,6 +299,8 @@
298299 TEST_EXTENSIONS = .ttf
299300 TTF_LOG_COMPILER = '$(FONTANVIL)' -lang=ff -script $(mvp)/fontlint.pe
300301
302+$(foreach test,$(TESTS),$(test).log ): $(mvp)/fontlint.pe
303+
301304 ############################################################################
302305
303306 # AUTOMAKE'S RULES WILL GO HERE
--- trunk/genjimon/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/genjimon/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
--- trunk/icemap/Makefile.am (revision 731)
+++ trunk/icemap/Makefile.am (revision 732)
@@ -128,6 +128,7 @@
128128 dist_noinst_SCRIPTS= \
129129 $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
130130 $(GCOV_TESTS) test/rmgcda test/gcov
131+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
131132
132133 bin_PROGRAMS = icemap
133134
--- trunk/icemap/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/icemap/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
--- trunk/idsgrep/Makefile.am (revision 731)
+++ trunk/idsgrep/Makefile.am (revision 732)
@@ -197,6 +197,7 @@
197197 chise2eids cjkvi2eids ed22eids kvg2eids \
198198 cjkvi-ids.txt \
199199 $(GCOV_TESTS) test/vgneko test/rmgcda test/gcov
200+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
200201
201202 bin_PROGRAMS = idsgrep
202203
--- trunk/kleknev/Makefile.am (revision 731)
+++ trunk/kleknev/Makefile.am (revision 732)
@@ -141,6 +141,7 @@
141141 dist_noinst_SCRIPTS:= \
142142 $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
143143 $(GCOV_TESTS)
144+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
144145
145146 bin_PROGRAMS = kleknev kleknev-argo
146147
--- trunk/kleknev/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/kleknev/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
--- trunk/ocr/Makefile.am (revision 731)
+++ trunk/ocr/Makefile.am (revision 732)
@@ -156,16 +156,17 @@
156156 # QVFG and FPEVCGF are DIST and SCRIPTS in ROT13, to keep Automake
157157 # from recognizing them
158158
159-STANDALONE_QVFG:=fntbase.mp fontlint.pe
159+STANDALONE_QVFG:=fntbase.mp
160160 EXTRA_DIST:= \
161161 $(if $(filter no,@parasite@),$(STANDALONE_QVFG)) \
162162 $(wildcard $(mvp)/*.mp) \
163163 ocr.tex ocra.fea ocrb.fea
164164
165-STANDALONE_FPEVCGF:=mp2pf
165+STANDALONE_FPEVCGF:=mp2pf fontlint.pe
166166 dist_noinst_SCRIPTS:= \
167167 $(if $(filter no,@parasite@),$(STANDALONE_FPEVCGF)) \
168168 ocra-no.pe ocra-yes.pe ocrb-no.pe ocrb-yes.pe ocrbnames.pe rmo.pe
169+nodist_noinst_SCRIPTS:=$(if $(filter yes,@parasite@),$(STANDALONE_FPEVCGF))
169170
170171 dist_pdf_DATA = $(MAYBE_DOCS)
171172
--- trunk/ocr/m4/tsu_fix_makefile.m4 (revision 731)
+++ trunk/ocr/m4/tsu_fix_makefile.m4 (revision 732)
@@ -41,7 +41,7 @@
4141 # This macro is released to the public domain by its author,
4242 # Matthew Skala <mskala@ansuz.sooke.bc.ca>.
4343
44-#serial 1
44+#serial 2
4545
4646 AC_DEFUN([TSU_FIX_MAKEFILE], [
4747 AC_CONFIG_COMMANDS([fix-makefile],
@@ -63,6 +63,10 @@
6363 s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl
6464 config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl
6565 dnl
66+dnl Current Automake uses a different variable name; hit that one too
67+s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl
68+config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl
69+dnl
6670 dnl Change lines that look like Automake's "make clean" recipes, to
6771 dnl use our pretty output format.
6872 s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl
Show on old repository browser