diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/texk/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/Makefile.am | 6 | ||||
| -rw-r--r-- | Build/source/texk/Makefile.in | 7 |
6 files changed, 26 insertions, 3 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 3613496c079..fbf57134cad 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,8 @@ +2010-03-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (triptrap): Run intermediate triptrap target in + texk/, texk/web2c/Makefile might not yet exist. + 2010-03-04 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (triptrap): New target to run TRIP and TRAP tests. diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index bd1510d5072..d6652f52b3d 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live top-level ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## Use 'aclocal --force' (for "computed m4_sinclude") @@ -65,4 +65,4 @@ skip: # Special target to run TRIP and TRAP tests and create diffs. .PHONY: triptrap triptrap: - cd texk/web2c && $(MAKE) $(AM_MAKEFLAGS) $@ + cd texk && $(MAKE) $(AM_MAKEFLAGS) $@ diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 2221dd05e77..c2791df2a45 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -850,7 +850,7 @@ skip: # Special target to run TRIP and TRAP tests and create diffs. .PHONY: triptrap triptrap: - cd texk/web2c && $(MAKE) $(AM_MAKEFLAGS) $@ + cd texk && $(MAKE) $(AM_MAKEFLAGS) $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 92336589351..71230e63cbd 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,8 @@ +2010-03-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (triptrap): New target to first ensure that + web2c/Makefile exists and then run TRIP and TRAP tests. + 2010-02-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (EXTRA_DIST): Add tests/common-test.pl. diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index f140c5f355f..bdc1e314966 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -61,3 +61,9 @@ subtexk: $(CONFIG_AUX) # Common infrastructure for tests EXTRA_DIST = tests/common-test.pl +# Special target to run TRIP and TRAP tests and create diffs. +.PHONY: triptrap +triptrap: web2c/Makefile + cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@ +web2c/Makefile: + $(MAKE) $(AM_MAKEFLAGS) DIST_SUBTEXK=web2c subtexk diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 23416c579c3..16bb42515af 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -793,6 +793,13 @@ subtexk: $(CONFIG_AUX) @echo "configure in ../auxdir/auxsub failed to create the file $@" exit 1 +# Special target to run TRIP and TRAP tests and create diffs. +.PHONY: triptrap +triptrap: web2c/Makefile + cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@ +web2c/Makefile: + $(MAKE) $(AM_MAKEFLAGS) DIST_SUBTEXK=web2c subtexk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |