diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/Makefile.pamphlet | 4 | ||||
| -rw-r--r-- | src/input/ChangeLog | 13 | ||||
| -rw-r--r-- | src/input/Makefile.in | 22 | ||||
| -rw-r--r-- | src/input/Makefile.pamphlet | 29 |
6 files changed, 32 insertions, 45 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 959bbaa9..e4d7f549 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (all-check): New rule. + * Makefile.in: Regenerate. + 2007-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (all-lisp): Don't make $(axiom_build_bindir) diff --git a/src/Makefile.in b/src/Makefile.in index c01dfcc7..b9f6bca2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,6 +62,10 @@ all-asq: all-algebra all-graph: all-lib cd graph && ${MAKE} +.PHONY: all-check +all-check: + cd input && $(MAKE) all-check + mostlyclean-local: -rm -f stamp diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet index e3e78734..4a8636b2 100644 --- a/src/Makefile.pamphlet +++ b/src/Makefile.pamphlet @@ -289,6 +289,10 @@ stamp: @axiom_src_all@ <<etcdir>> <<graphdir>> +.PHONY: all-check +all-check: + cd input && $(MAKE) all-check + mostlyclean-local: -rm -f stamp diff --git a/src/input/ChangeLog b/src/input/ChangeLog index 24ac6afd..2c2cfe54 100644 --- a/src/input/ChangeLog +++ b/src/input/ChangeLog @@ -1,3 +1,16 @@ +2007-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (all-ax all-input): Remove regress. + (${OUT}/%.input): Don't be overly verbose. + (%.input): Likewise. + (%.as): Likewise. + (use): Remove, as it is empty + (regress): Likewise. + (bug): Likewise. + (document): Likewise. + (all-check): New rule. Launch testing. + * Makefile.in: Regenerate. + 2007-05-28 Gabriel Dos Reis <gdr@cs.tamu,edu> * Makefile.pamphlet (regress): Don't use AX_FLAGS. diff --git a/src/input/Makefile.in b/src/input/Makefile.in index fd69985e..426fce8f 100644 --- a/src/input/Makefile.in +++ b/src/input/Makefile.in @@ -501,7 +501,7 @@ DOCFILES= \ all: all-ax -all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES} regress +all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES} @echo 1 finished $(srcdir) $(OUT): @@ -509,21 +509,17 @@ $(OUT): ${OUT}/%.input: %.input - @ echo generic 10 making $@ from $< @ $(INSTALL) $< $@ .PRECIOUS: %.input %.input: ${IN}/%.input.pamphlet - @ echo generic 11 making $@ from $< @$(axiom_build_document) --output=$@ --tangle $< ${OUT}/%.as: %.as - @echo generic 12 making $@ from $< @ $(INSTALL) $< $@ %.as: ${IN}/%.as.pamphlet - @echo generic 13 making $@ from $< @ $(axiom_build_document) --output=$@ --tangle $< pamphlets = \ @@ -531,18 +527,6 @@ pamphlets = \ $(wildchar *.input.pamphlet) \ $(wildchar.as.pamplhet) -use: - @echo 2 making ${OUT} from ${IN} - -regress: - ${MAKE} regression-tests - -bug: - @echo 4 making ${OUT} from ${IN} - -document: - @echo 5 documenting ${OUT} - mostlyclean-local: -rm -rf $(MID) -rm -rf $(OUT) @@ -753,8 +737,8 @@ OUTS= algaggr.output algbrbf.output algfacob.output alist.output \ # These files are tested in a different directory. ALGEBRA=INTHEORY.output VIEW2D.output TESTFR.output -.PHONY: regression-tests -regression-tests: ${OUTS} +.PHONY: all-check +all-check: ${OUTS} @ echo 1 finished ./$(top_builddir)/int/input %.output: %.input diff --git a/src/input/Makefile.pamphlet b/src/input/Makefile.pamphlet index cb8129e0..7e5b4860 100644 --- a/src/input/Makefile.pamphlet +++ b/src/input/Makefile.pamphlet @@ -16,12 +16,6 @@ \eject \section{Introduction} -This creates the mnt/sys/input subdirectory. The files are known -as ``input'' files which are a list of Axiom commands. Each file -(say ``foo.input'') can run in an Axiom system with the command: -\begin{verbatim} -)read foo.input -\end{verbatim} Each of the files in this subdirectory is intended to achieve a three goals. First, the file shows examples of how to use Axiom @@ -58,21 +52,17 @@ regress target. <<genericRules>>= ${OUT}/%.input: %.input - @ echo generic 10 making $@ from $< @ $(INSTALL) $< $@ .PRECIOUS: %.input %.input: ${IN}/%.input.pamphlet - @ echo generic 11 making $@ from $< @$(axiom_build_document) --output=$@ --tangle $< ${OUT}/%.as: %.as - @echo generic 12 making $@ from $< @ $(INSTALL) $< $@ %.as: ${IN}/%.as.pamphlet - @echo generic 13 making $@ from $< @ $(axiom_build_document) --output=$@ --tangle $< pamphlets = \ @@ -124,7 +114,6 @@ all-ax all-input: echo aging ${OUT}/`basename $$i .rec`.out ; \ ${TOUCH} 0101010189 `basename $$i .rec`.out ;fi ;done) @ (cd ${OUT} ; ${MAKE} -f Makefile `echo *.out` ) -# @ (cd ${OUT} ; maildiff ) @ echo done and yet further stanzas @@ -367,8 +356,8 @@ OUTS= algaggr.output algbrbf.output algfacob.output alist.output \ # These files are tested in a different directory. ALGEBRA=INTHEORY.output VIEW2D.output TESTFR.output -.PHONY: regression-tests -regression-tests: ${OUTS} +.PHONY: all-check +all-check: ${OUTS} @ echo 1 finished ./$(top_builddir)/int/input %.output: %.input @@ -889,7 +878,7 @@ DOCFILES= \ all: all-ax -all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES} regress +all-ax all-input: $(OUT) ${FILES} ${FILES2} ${ASFILES} @echo 1 finished $(srcdir) $(OUT): @@ -897,18 +886,6 @@ $(OUT): <<genericRules>> -use: - @echo 2 making ${OUT} from ${IN} - -regress: - ${MAKE} regression-tests - -bug: - @echo 4 making ${OUT} from ${IN} - -document: - @echo 5 documenting ${OUT} - mostlyclean-local: -rm -rf $(MID) -rm -rf $(OUT) |