• R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision337 (tree)
Time2012-09-28 01:52:47
Authormskala

Log Message

OCR 0.2, first release as parasite

Change Summary

Incremental Difference

--- trunk/m4/ax_am_jobserver.m4 (revision 336)
+++ trunk/m4/ax_am_jobserver.m4 (revision 337)
@@ -24,6 +24,14 @@
2424 #
2525 # to your Makefile.am files.
2626 #
27+# MODIFIED
28+#
29+# By Matthew Skala, <mskala@ansuz.sooke.bc.ca>, 24 September 2012, to
30+# make the -j flag conditional, removing a "-jN forced in submake"
31+# warning when used in nested packages. This probably requires GNU Make,
32+# but that was likely required already. It also requires a variable named
33+# percent, because literal percent signs seem to break things here.
34+#
2735 # LICENSE
2836 #
2937 # Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
@@ -33,7 +41,7 @@
3341 # and this notice are preserved. This file is offered as-is, without any
3442 # warranty.
3543
36-#serial 7
44+#serial 8
3745
3846 AC_DEFUN([AX_AM_JOBSERVER], [
3947 AC_REQUIRE([AX_COUNT_CPUS])
@@ -46,5 +54,6 @@
4654 ((enable_jobserver++))])
4755 m4_pattern_allow(AM_MAKEFLAGS)
4856 AS_IF([test "x$enable_jobserver" != "xno"],
49- [AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver )])
57+ [AX_ADD_AM_MACRO([AM_MAKEFLAGS += \$(if \$(filter -j\$(percent),\$(MAKEFLAGS)),,-j$enable_jobserver )
58+])])
5059 ])
--- trunk/ocr/m4/ax_am_jobserver.m4 (revision 336)
+++ trunk/ocr/m4/ax_am_jobserver.m4 (revision 337)
@@ -24,6 +24,14 @@
2424 #
2525 # to your Makefile.am files.
2626 #
27+# MODIFIED
28+#
29+# By Matthew Skala, <mskala@ansuz.sooke.bc.ca>, 24 September 2012, to
30+# make the -j flag conditional, removing a "-jN forced in submake"
31+# warning when used in nested packages. This probably requires GNU Make,
32+# but that was likely required already. It also requires a variable named
33+# percent, because literal percent signs seem to break things here.
34+#
2735 # LICENSE
2836 #
2937 # Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
@@ -33,7 +41,7 @@
3341 # and this notice are preserved. This file is offered as-is, without any
3442 # warranty.
3543
36-#serial 7
44+#serial 8
3745
3846 AC_DEFUN([AX_AM_JOBSERVER], [
3947 AC_REQUIRE([AX_COUNT_CPUS])
@@ -46,5 +54,6 @@
4654 ((enable_jobserver++))])
4755 m4_pattern_allow(AM_MAKEFLAGS)
4856 AS_IF([test "x$enable_jobserver" != "xno"],
49- [AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver )])
57+ [AX_ADD_AM_MACRO([AM_MAKEFLAGS += \$(if \$(filter -j\$(percent),\$(MAKEFLAGS)),,-j$enable_jobserver )
58+])])
5059 ])
--- trunk/ocr/ocr.tex (revision 336)
+++ trunk/ocr/ocr.tex (revision 337)
@@ -13,8 +13,9 @@
1313 \setlength{\parskip}{\baselineskip}
1414 \raggedright
1515
16-\title{OCR-A and OCR-B fonts\\in MetaType1 format}
16+\title{OCR-A and OCR-B fonts\\version 0.2}
1717 \author{Matthew Skala}
18+\date{September 27, 2012}
1819
1920 \begin{document}
2021 \setmainfont{OCRB.otf}
@@ -46,11 +47,7 @@
4647 I'm now in a position to write better ones.
4748
4849 This package contains those better fonts. More work still needs to be done,
49-but it's already a significant improvement on the older packages. In this
50-version I've also merged the OCR A and OCR B packages into one, and updated
51-the description of licensing terms to take into account Norbert Schwarz's
52-gracious release of his work to commercial users (which had also been a
53-frequently-asked question among users of my older packages).
50+but it's already a significant improvement on the older packages.
5451
5552 Each font is provided in three ready-made forms: PostScript (.pfb and .afm
5653 files), TrueType (.ttf files), and OpenType (.otf files). Almost any
@@ -61,7 +58,10 @@
6158 if you actually want to use these fonts for OCR applications (their original
6259 purpose) then you should be very careful about which glyphs you use, because
6360 both typefaces have been extended by others (not me) to contain nonstandard
64-glyphs beyond the official ones.
61+glyphs beyond the official ones. Similarly, this package contains some
62+nonstandard styles for OCR B (italic, reverse video, and outline) which
63+may be visually appealing but are probably not appropriate for actual
64+OCR use.
6565
6666 Please note that although the Metafont definitions for both OCR A and OCR B
6767 purport to support "optical size," they actually just scale the outlines
@@ -68,10 +68,14 @@
6868 linearly for the different sizes, so when converting to a scaleable format
6969 there's no point treating the different sizes separately.
7070
71-My email address is \url{mailto:mskala@ansuz.sooke.bc.ca}~. The Web point of
72-contact for this and my other font projects is (English language)
73-\url{http://ansuz.sooke.bc.ca/page/fonts} and (Japanese language)
74-\url{http://ansuz.sooke.bc.ca/page/fonts-jp/_1}~.
71+My email address is \url{mailto:mskala@ansuz.sooke.bc.ca}~. As of this
72+version, this package has become part of the Tsukurimashou Project at
73+\url{http://tsukurimashou.sourceforge.jp/}~. That is a bilingual page,
74+English and Japanese; you can select the other one in the upper right corner
75+if your browser's language preferences are misconfigured. All bug reports
76+and feature and support requests for these OCR fonts should be filed in the
77+Tsukurimashou Project's ticket tracker, with the component set to "Parasite
78+font packages."
7579
7680 \setmainfont{OCRA.otf}
7781 \setmonofont{OCRA.otf}
@@ -159,24 +163,71 @@
159163
160164 \section{Compiling the fonts}
161165
162-If you want to recompile these fonts, you will need MetaType1, Fontforge
163-(which in turn should be compiled with the "--enable-longdouble"
164-configuration option), GNU Make, and a command-line environment that
165-reasonably resembles Slackware Linux. Current Mac installations should
166-work. To recompile this document, you will also need XeLaTeX\@. Once all the
167-needed software is in place, it should work by just typing "make". The
168-compilation process will produce a large number of error messages; most of
169-these are associated with bugs in Fontforge's spline geometry code, and are
170-unavoidable.
166+Note that the binary font files are included in the package. Most users
167+will have no reason to recompile them, and can safely ignore this section.
171168
172-Most of the MetaType1 source code files in this package
169+As of this version, this package builds using a stripped-down version of
170+MetaType1 with some bugs fixed, inherited from the Tsukurimashou Project.
171+The relevant code is bundled with this package, and (where applicable)
172+relicensed to public domain. MetaType1 is no longer a dependency; Perl,
173+Metapost (which should be included in a standard TeX distribution) and t1asm
174+(part of the t1utils package) are now dependencies. FontForge is a
175+dependency. Recompiling this document will also require XeLaTeX (which
176+should be included in a standard TeX distribution); and there are additional
177+considerations relevant to the test suite, for which see the "Testing the
178+fonts" section below. Having "expect" is recommended but not required.
179+
180+This package includes a standard GNU Autotools build system; if you have the
181+prerequisites, it should work by running "./configure" followed by "make".
182+If you turn off the default feature that hides them, the compilation process
183+will produce a large number of error messages; most of these are associated
184+with bugs in Fontforge's spline geometry code, and are unavoidable.
185+
186+The build system supports a "make install" target; however, you might not
187+want to use it, because it will install all the different styles and
188+formats of the fonts and quite possibly install them in places other than
189+where you expect. Most users will probably only want one format and a
190+limited selection of styles, and would be better served by manually copying
191+the files they want after building. Note that all the finished fonts
192+intended for installation and use have filenames starting with capitalized
193+"OCR"; there are intermediate Postscript files created during the build
194+under names that start with lowercase "msk-ocr," but those are lacking
195+important metadata and should not be installed and used directly.
196+
197+Most of the Metapost source code files in this package
173198 have had their names changed by prefixing "msk-"; that is to prevent a
174199 collision with the filenames used by the original TeX packages. If, like
175200 me, you try to compile these fonts on a system that also has the original
176201 TeX packages installed, there would otherwise be a danger of getting the
177-original MetaFont files mixed with these MetaType1 files in a way that would
178-cause it to fail. I couldn't figure out how to force MetaType1 to really
202+original MetaFont files mixed with these Metapost files in a way that would
203+cause it to fail. I couldn't figure out how to force Metapost to really
179204 use a specified pathname instead of going through TeX's filename search; it
180205 appears to strip off all specified path information.
181206
207+\section{Testing the fonts}
208+
209+The build system supports a "make check" target, which will run FontForge's
210+"fontlint" program on all the installable fonts. This is a very demanding
211+test. It will report a failure on anything that FontForge's developers (and
212+even though I have sometimes been credited as one of these, I do not take
213+responsibility for this point) think is against the rules or even vaguely
214+questionable. Most fontlint validation errors are harmless in actual
215+practice; so if you run "make check" and see nothing but red, Don't Panic.
216+
217+At the very least, "make check" will almost certainly fail if your fonts
218+were built with a version of FontForge that did not support my proposed
219+optional argument to AddExtrema(); and as of this writing the only version
220+of FontForge that supports that is the one in my Github fork at
221+\url{https://github.com/mskala/fontforge}~. The issue, for those
222+interested, is that FontForge's "add extrema" operation has several
223+different operating modes, including one that adds all possible extrema and
224+one that only adds them in cases where it's considered "safe" to do so. The
225+scripting language by default can only invoke the "safe" version; but
226+fontlint demands all extrema whether safe or not, so without a patched
227+version that makes the other modes available to the scripting language, it's
228+not possible for scripts to generate fonts that can pass fontlint.
229+
230+Please do not report validation errors as bugs if you are not using the
231+version of FontForge from my Github fork.
232+
182233 \end{document}
--- trunk/ocr/configure.ac (revision 336)
+++ trunk/ocr/configure.ac (revision 337)
@@ -145,12 +145,18 @@
145145 # Add our new directories
146146 TSUKU_ADD_INSTDIR_OPTION([font],[datarootdir],[fonts],[fonts],
147147 [f],[obsolete gas option])
148+TSUKU_ADD_INSTDIR_OPTION([afm],[fontdir],[afm],
149+ [Adobe Font Metrics],
150+ [afm],[ --prefix ])
151+TSUKU_ADD_INSTDIR_OPTION([type1],[fontdir],[type1],
152+ [Postscript Type 1 fonts],
153+ [ty],[ --prefix ])
154+TSUKU_ADD_INSTDIR_OPTION([ttf],[fontdir],[TTF],
155+ [TrueType fonts],
156+ [tt],[ --prefix ])
148157 TSUKU_ADD_INSTDIR_OPTION([otf],[fontdir],[OTF],
149158 [OpenType fonts],
150159 [ot],[ --prefix ])
151-TSUKU_ADD_INSTDIR_OPTION([ttf],[fontdir],[TTF],
152- [TrueType fonts],
153- [tt],[ --prefix ])
154160
155161 # Reduce the ridiculous verbosity of Autoconf's help message
156162 TSUKU_DEFINITION_SUBST([_AC_INIT_HELP],
@@ -180,7 +186,7 @@
180186 #
181187 AC_PREREQ([2.63])
182188 AC_INIT([OCR],
183- [0.2pre], [mskala@ansuz.sooke.bc.ca], [ocr],
189+ [0.2], [mskala@ansuz.sooke.bc.ca], [ocr],
184190 [[http://tsukurimashou.sourceforge.jp/]])
185191 AC_PRESERVE_HELP_ORDER
186192 AC_CONFIG_AUX_DIR([.])
@@ -188,9 +194,9 @@
188194 parallel-tests silent-rules])
189195 AC_CONFIG_SRCDIR([msk-ocra.mp])
190196 AC_CONFIG_MACRO_DIR([m4])
191-AC_REVISION([$Id: configure.ac 1712 2012-09-24 00:33:17Z mskala $])
197+AC_REVISION([$Id: configure.ac 1724 2012-09-27 16:51:05Z mskala $])
192198 AC_COPYRIGHT([public domain])
193-AC_SUBST([release_date],["September 22, 2012"])
199+AC_SUBST([release_date],["September 27, 2012"])
194200 AM_SILENT_RULES
195201 #
196202 ############################################################################
--- trunk/ocr/Makefile.am (revision 336)
+++ trunk/ocr/Makefile.am (revision 337)
@@ -29,6 +29,7 @@
2929 empty:=
3030 space:=$(empty) $(empty)
3131 comma:=,
32+percent=%
3233
3334 ############################################################################
3435
@@ -139,7 +140,8 @@
139140 STANDALONE_QVFG:=fntbase.mp
140141 EXTRA_DIST:= \
141142 $(if $(filter $(distdir),$(top_distdir)),$(STANDALONE_QVFG)) \
142- ocr.tex
143+ $(wildcard $(mvp)/*.mp) \
144+ ocr.tex ocra.fea ocrb.fea
143145
144146 STANDALONE_FPEVCGF:=mp2pf
145147 dist_noinst_SCRIPTS:= \
@@ -150,6 +152,11 @@
150152
151153 dist_otf_DATA = OCRA.otf \
152154 OCRB.otf OCRBE.otf OCRBF.otf OCRBL.otf OCRBS.otf OCRBX.otf
155+dist_ttf_DATA = OCRA.ttf \
156+ OCRB.ttf OCRBE.ttf OCRBF.ttf OCRBL.ttf OCRBS.ttf OCRBX.ttf
157+dist_type1_DATA = OCRA.pfb \
158+ OCRB.pfb OCRBE.pfb OCRBF.pfb OCRBL.pfb OCRBS.pfb OCRBX.pfb
159+dist_afm_DATA = $(patsubst %.pfb,%.afm,$(dist_type1_DATA))
153160
154161 ############################################################################
155162
@@ -157,8 +164,11 @@
157164
158165 MOSTLYCLEANFILES = \
159166 *.afm *.otf *.pfb *.rmo *.ttf \
160- ocr.aux ocr.log ocr.out
167+ ocr.aux ocr.log ocr.out ocr.pdf
161168
169+DISTCLEANFILES = \
170+ aminclude.am ffaetest.pe
171+
162172 ############################################################################
163173
164174 # POSTSCRIPT FONTS
@@ -209,7 +219,7 @@
209219 msk-ocrb10xbg.pfb: msk-ocrb10xbg.mp msk-ocrbdef.mp msk-ocrbmac.mp
210220
211221 %.rmo: %.pfb rmo.pe
212- $(AM_V_at)$(TSU_V_RMO)$(FONTFORGE) rmo.pe $*.pfb $(TSU_V_REDIR)
222+ $(AM_V_at)$(TSU_V_RMO)$(FONTFORGE) $(mvp)/rmo.pe $*.pfb $(TSU_V_REDIR)
213223 $(AM_V_at)touch $*.rmo
214224
215225 msk-ocra10.rmo: msk-ocra10.pfb
@@ -239,45 +249,53 @@
239249 OCRA.pfb OCRA.afm OCRA.ttf OCRA.otf: msk-ocra10.rmo \
240250 ocra-@ae_arg_okay@.pe ocra.fea
241251 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
242- ocra-@ae_arg_okay@.pe $(TSU_V_REDIR)
252+ $(mvp)/ocra-@ae_arg_okay@.pe \
253+ $(mvp)/ocra.fea $(TSU_V_REDIR)
243254
244255 OCRB.pfb OCRB.afm OCRB.ttf OCRB.otf: \
245256 msk-ocrb10.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
246257 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
247- ocrb-@ae_arg_okay@.pe '' '' "Regular" 0 $(TSU_V_REDIR)
258+ $(mvp)/ocrb-@ae_arg_okay@.pe '' '' "Regular" 0 \
259+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
248260
249261 OCRBE.pfb OCRBE.afm OCRBE.ttf OCRBE.otf: \
250262 msk-ocrb10efg.rmo msk-ocrb10ebg.rmo \
251263 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
252264 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
253- ocrb-@ae_arg_okay@.pe 'e' 'E' "Inverted Sharp" 1 $(TSU_V_REDIR)
265+ $(mvp)/ocrb-@ae_arg_okay@.pe 'e' 'E' "Inverted Sharp" 1 \
266+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
254267
255268 OCRBF.pfb OCRBF.afm OCRBF.ttf OCRBF.otf: \
256269 msk-ocrb10ffg.rmo msk-ocrb10fbg.rmo \
257270 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
258271 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
259- ocrb-@ae_arg_okay@.pe 'f' 'F' "Outline" 1 $(TSU_V_REDIR)
272+ $(mvp)/ocrb-@ae_arg_okay@.pe 'f' 'F' "Outline" 1 \
273+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
260274
261275 OCRBG.pfb OCRBG.afm OCRBG.ttf OCRBG.otf: \
262276 msk-ocrb10g.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
263277 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
264- ocrb-@ae_arg_okay@.pe 'g' 'G' "Slanted Outline" 0 $(TSU_V_REDIR)
278+ $(mvp)/ocrb-@ae_arg_okay@.pe 'g' 'G' "Slanted Outline" 0 \
279+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
265280
266281 OCRBL.pfb OCRBL.afm OCRBL.ttf OCRBL.otf: \
267282 msk-ocrb10l.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
268283 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
269- ocrb-@ae_arg_okay@.pe 'l' 'L' "Slanted" 0 $(TSU_V_REDIR)
284+ $(mvp)/ocrb-@ae_arg_okay@.pe 'l' 'L' "Slanted" 0 \
285+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
270286
271287 OCRBS.pfb OCRBS.afm OCRBS.ttf OCRBS.otf: \
272288 msk-ocrb10s.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
273289 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
274- ocrb-@ae_arg_okay@.pe 's' 'S' "Sharp" 0 $(TSU_V_REDIR)
290+ $(mvp)/ocrb-@ae_arg_okay@.pe 's' 'S' "Sharp" 0 \
291+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
275292
276293 OCRBX.pfb OCRBX.afm OCRBX.ttf OCRBX.otf: \
277294 msk-ocrb10xfg.rmo msk-ocrb10xbg.rmo \
278295 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
279296 $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
280- ocrb-@ae_arg_okay@.pe 'x' 'X' "Inverted" 1 $(TSU_V_REDIR)
297+ $(mvp)/ocrb-@ae_arg_okay@.pe 'x' 'X' "Inverted" 1 \
298+ $(mvp)/ocrb.fea $(TSU_V_REDIR)
281299
282300 ############################################################################
283301
@@ -284,15 +302,14 @@
284302 # PDF DOCUMENTATION
285303
286304 ocr.pdf: OCRA.otf OCRB.otf ocr.tex
287- $(AM_V_at)$(TSU_V_TEX)$(expect_start)$(XELATEX) ocr$(expect_end)
305+ $(AM_V_at)$(TSU_V_TEX)$(expect_start)$(XELATEX) $(mvp)/ocr$(expect_end)
288306
289307 ############################################################################
290308
291309 # TESTING
292310
293-TESTS = $(dist_otf_DATA)
294-TEST_EXTENSIONS = .otf
295-OTF_LOG_COMPILER = fontlint
311+TESTS = $(dist_otf_DATA) $(dist_ttf_DATA) $(dist_type1_DATA)
312+LOG_COMPILER = fontlint
296313
297314 ############################################################################
298315
--- trunk/idsgrep/m4/ax_am_jobserver.m4 (revision 336)
+++ trunk/idsgrep/m4/ax_am_jobserver.m4 (revision 337)
@@ -24,6 +24,14 @@
2424 #
2525 # to your Makefile.am files.
2626 #
27+# MODIFIED
28+#
29+# By Matthew Skala, <mskala@ansuz.sooke.bc.ca>, 24 September 2012, to
30+# make the -j flag conditional, removing a "-jN forced in submake"
31+# warning when used in nested packages. This probably requires GNU Make,
32+# but that was likely required already. It also requires a variable named
33+# percent, because literal percent signs seem to break things here.
34+#
2735 # LICENSE
2836 #
2937 # Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
@@ -33,7 +41,7 @@
3341 # and this notice are preserved. This file is offered as-is, without any
3442 # warranty.
3543
36-#serial 7
44+#serial 8
3745
3846 AC_DEFUN([AX_AM_JOBSERVER], [
3947 AC_REQUIRE([AX_COUNT_CPUS])
@@ -46,5 +54,6 @@
4654 ((enable_jobserver++))])
4755 m4_pattern_allow(AM_MAKEFLAGS)
4856 AS_IF([test "x$enable_jobserver" != "xno"],
49- [AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver )])
57+ [AX_ADD_AM_MACRO([AM_MAKEFLAGS += \$(if \$(filter -j\$(percent),\$(MAKEFLAGS)),,-j$enable_jobserver )
58+])])
5059 ])
--- trunk/idsgrep/Makefile.am (revision 336)
+++ trunk/idsgrep/Makefile.am (revision 337)
@@ -34,6 +34,7 @@
3434 empty:=
3535 space:=$(empty) $(empty)
3636 comma:=,
37+percent=%
3738
3839 ############################################################################
3940
--- trunk/configure.ac (revision 336)
+++ trunk/configure.ac (revision 337)
@@ -201,7 +201,7 @@
201201 AC_CONFIG_SRCDIR([hamlog/hamlog])
202202 AC_CONFIG_HEADERS([config.h])
203203 AC_CONFIG_MACRO_DIR([m4])
204-AC_REVISION([$Id: configure.ac 1712 2012-09-24 00:33:17Z mskala $])
204+AC_REVISION([$Id: configure.ac 1715 2012-09-25 13:58:51Z mskala $])
205205 AC_COPYRIGHT([Copyright (C) 2011, 2012 Matthew Skala])
206206 AC_SUBST([release_date],["June 18, 2012"])
207207 AM_SILENT_RULES
@@ -683,7 +683,8 @@
683683 's#(\$\(AUTOMAKE\) --foreign( Makefile)?)(?! && ./config)#'\
684684 '\1 && \$(SHELL) ./config.status fix-makefile#;'\
685685 's#config\.status \$\@ \$\(am__depfiles_maybe\)#'\
686-'config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;' \
686+'config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;'\
687+'s#TESTS = #TESTS = \$(otf_DATA) #;' \
687688 Makefile
688689 rm -f pfb-stamp chl-stamp],
689690 [PERL=$PERL])
--- trunk/genjimon/m4/ax_am_jobserver.m4 (revision 336)
+++ trunk/genjimon/m4/ax_am_jobserver.m4 (revision 337)
@@ -24,6 +24,14 @@
2424 #
2525 # to your Makefile.am files.
2626 #
27+# MODIFIED
28+#
29+# By Matthew Skala, <mskala@ansuz.sooke.bc.ca>, 24 September 2012, to
30+# make the -j flag conditional, removing a "-jN forced in submake"
31+# warning when used in nested packages. This probably requires GNU Make,
32+# but that was likely required already. It also requires a variable named
33+# percent, because literal percent signs seem to break things here.
34+#
2735 # LICENSE
2836 #
2937 # Copyright (c) 2008 Michael Paul Bailey <jinxidoru@byu.net>
@@ -33,7 +41,7 @@
3341 # and this notice are preserved. This file is offered as-is, without any
3442 # warranty.
3543
36-#serial 7
44+#serial 8
3745
3846 AC_DEFUN([AX_AM_JOBSERVER], [
3947 AC_REQUIRE([AX_COUNT_CPUS])
@@ -46,5 +54,6 @@
4654 ((enable_jobserver++))])
4755 m4_pattern_allow(AM_MAKEFLAGS)
4856 AS_IF([test "x$enable_jobserver" != "xno"],
49- [AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver )])
57+ [AX_ADD_AM_MACRO([AM_MAKEFLAGS += \$(if \$(filter -j\$(percent),\$(MAKEFLAGS)),,-j$enable_jobserver )
58+])])
5059 ])
--- trunk/genjimon/Makefile.am (revision 336)
+++ trunk/genjimon/Makefile.am (revision 337)
@@ -43,6 +43,7 @@
4343 empty:=
4444 space:=$(empty) $(empty)
4545 comma:=,
46+percent=%
4647
4748 ############################################################################
4849
--- trunk/Makefile.am (revision 336)
+++ trunk/Makefile.am (revision 337)
@@ -49,6 +49,7 @@
4949 empty:=
5050 space:=$(empty) $(empty)
5151 comma:=,
52+percent=%
5253
5354 # This is a nasty hack, but seems to be needed to get the variables
5455 # included soon enough for them to be useful in Automake's recipes
@@ -1004,4 +1005,4 @@
10041005
10051006 TESTS = $(dist_otf_DATA)
10061007 TEST_EXTENSIONS = .otf
1007-OTF_LOG_COMPILER = true || fontlint
1008+OTF_LOG_COMPILER = fontlint
Show on old repository browser