summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/omegaware/am/omegaware.am
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/omegaware/am/omegaware.am')
-rw-r--r--Build/source/texk/web2c/omegaware/am/omegaware.am100
1 files changed, 61 insertions, 39 deletions
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 0709ea1df30..2f12023bc33 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -23,10 +23,9 @@ ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
nodist_odvicopy_SOURCES = odvicopy.c odvicopy.h
odvicopy.c odvicopy.h: odvicopy-web2c
-odvicopy-web2c: $(web2c_depend) odvicopy.p
- $(web2c) odvicopy
- echo timestamp >$@
- touch odvicopy.c odvicopy.h
+ @$(web2c) odvicopy
+odvicopy-web2c: odvicopy.p $(web2c_depend)
+ @$(web2c) odvicopy
EXTRA_DIST += $(odvicopy_sources)
odvicopy_sources = omegaware/odvicopy.web omegaware/odvicopy.ch
odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
@@ -34,10 +33,9 @@ odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
nodist_odvitype_SOURCES = odvitype.c odvitype.h
odvitype.c odvitype.h: odvitype-web2c
-odvitype-web2c: $(web2c_depend) odvitype.p
- $(web2c) odvitype
- echo timestamp >$@
- touch odvitype.c odvitype.h
+ @$(web2c) odvitype
+odvitype-web2c: odvitype.p $(web2c_depend)
+ @$(web2c) odvitype
EXTRA_DIST += $(odvitype_sources)
odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch
odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
@@ -45,10 +43,9 @@ odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
nodist_ofm2opl_SOURCES = ofm2opl.c ofm2opl.h
ofm2opl.c ofm2opl.h: ofm2opl-web2c
-ofm2opl-web2c: $(web2c_depend) ofm2opl.p
- $(web2c) ofm2opl
- echo timestamp >$@
- touch ofm2opl.c ofm2opl.h
+ @$(web2c) ofm2opl
+ofm2opl-web2c: ofm2opl.p $(web2c_depend)
+ @$(web2c) ofm2opl
EXTRA_DIST += $(ofm2opl_sources)
ofm2opl_sources = omegaware/ofm2opl.web omegaware/ofm2opl.ch
ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources)
@@ -56,10 +53,9 @@ ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources)
nodist_opl2ofm_SOURCES = opl2ofm.c opl2ofm.h
opl2ofm.c opl2ofm.h: opl2ofm-web2c
-opl2ofm-web2c: $(web2c_depend) opl2ofm.p
- $(web2c) opl2ofm
- echo timestamp >$@
- touch opl2ofm.c opl2ofm.h
+ @$(web2c) opl2ofm
+opl2ofm-web2c: opl2ofm.p $(web2c_depend)
+ @$(web2c) opl2ofm
EXTRA_DIST += $(opl2ofm_sources)
opl2ofm_sources = omegaware/opl2ofm.web omegaware/opl2ofm.ch
opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources)
@@ -67,10 +63,9 @@ opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources)
nodist_otangle_SOURCES = otangle.c otangle.h
otangle.c otangle.h: otangle-web2c
-otangle-web2c: $(web2c_depend) otangle.p
- $(web2c) otangle
- echo timestamp >$@
- touch otangle.c otangle.h
+ @$(web2c) otangle
+otangle-web2c: otangle.p $(web2c_depend)
+ @$(web2c) otangle
EXTRA_DIST += $(otangle_sources)
otangle_sources = omegaware/otangle.web omegaware/otangle.ch
otangle.p: tangle$(EXEEXT) $(otangle_sources)
@@ -78,10 +73,9 @@ otangle.p: tangle$(EXEEXT) $(otangle_sources)
nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
-ovf2ovp-web2c: $(web2c_depend) ovf2ovp.p
- $(web2c) ovf2ovp
- echo timestamp >$@
- touch ovf2ovp.c ovf2ovp.h
+ @$(web2c) ovf2ovp
+ovf2ovp-web2c: ovf2ovp.p $(web2c_depend)
+ @$(web2c) ovf2ovp
EXTRA_DIST += $(ovf2ovp_sources)
ovf2ovp_sources = omegaware/ovf2ovp.web omegaware/ovf2ovp.ch
ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources)
@@ -89,10 +83,9 @@ ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources)
nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
-ovp2ovf-web2c: $(web2c_depend) ovp2ovf.p
- $(web2c) ovp2ovf
- echo timestamp >$@
- touch ovp2ovf.c ovp2ovf.h
+ @$(web2c) ovp2ovf
+ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
+ @$(web2c) ovp2ovf
EXTRA_DIST += $(ovp2ovf_sources)
ovp2ovf_sources = omegaware/ovp2ovf.web omegaware/ovp2ovf.ch
ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources)
@@ -100,27 +93,56 @@ ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources)
## Tests
##
-EXTRA_DIST += omegaware/level1.test omegaware/omfonts.test \
+EXTRA_DIST += omegaware/level1.test \
+ omegaware/odvicopy.test omegaware/odvitype.test \
+ omegaware/ofonts.test omegaware/omfonts.test \
omegaware/otangle.test omegaware/specialhex.test
if OTANGLE
-TESTS += omegaware/otangle.test
+TESTS += omegaware/odvicopy.test omegaware/odvitype.test \
+ omegaware/otangle.test
if !OMFONTS
-TESTS += omegaware/level1.test omegaware/omfonts.test omegaware/specialhex.test
+TESTS += omegaware/level1.test omegaware/ofonts.test \
+ omegaware/omfonts.test omegaware/specialhex.test
endif !OMFONTS
endif OTANGLE
## omegaware/level1.test
-DISTCLEANFILES += tests/xlevel1.ofm tests/xlevel1.opl
+EXTRA_DIST += omegaware/tests/level1.opl
+DISTCLEANFILES += omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl
+## omegaware/odvicopy.test (and ofonts.test)
+EXTRA_DIST += \
+ omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
+ omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
+ omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \
+ omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \
+ omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \
+ omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf
+DISTCLEANFILES += ofont*vf
+## omegaware/odvitype.test (and odvicopy.test, ofonts.test)
+EXTRA_DIST += omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
+ omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
+ omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
+ omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \
+ omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm
+DISTCLEANFILES += omegaware/tests/xofont*
+## omegaware/ofonts.test
+EXTRA_DIST += omegaware/tests/ofontr0.pl \
+ omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \
+ omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \
+ omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \
+ omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \
+ omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \
+ omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp
## omegaware/omfonts.test
-DISTCLEANFILES += tests/Cherokee.tfm tests/OCherokee.ofm \
- tests/OCherokee.opl tests/OCherokee.ovf \
- tests/xCherokee.pl tests/xOCherokee.ofm \
- tests/xOCherokee.opl tests/xOCherokee.ovp
+EXTRA_DIST += omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp
+DISTCLEANFILES += omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+ omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+ omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.*
## omegaware/otangle.test
DISTCLEANFILES += cftest.p
## omegaware/specialhex.test
-DISTCLEANFILES += tests/specialhex.ofm tests/specialhex.opl \
- tests/specialhex.ovf tests/xspecialhex.ofm \
- tests/xspecialhex.opl tests/xspecialhex.ovp
+EXTRA_DIST += omegaware/tests/specialhex.ovp
+DISTCLEANFILES += omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+ omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.*