From ef6d755c944ef5af40c909c6683a3691dc9f6a57 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 21 Aug 2010 03:07:54 +0000
Subject: 	External tool noweb is no longer required. 	* INSTALL:
 Update instructions. 	* Makefile.pamphlet: Remove rules for building noweb. 
 (AXIOM_SRC_TARGETS): Include all-utils. 	* config/open-axiom.m4
 (OPENAXIOM_BUILD_TOOLS): Don't check for 	notangle and noweave. 	*
 config/setup-dep.mk: Remove rules for generating document. 	*
 config/var-def.mk: Remove NOTANGLE and NOWEAVE variables. 	*
 configure.ac: Instantiate Makefile for src/utils.

---
 src/algebra/Makefile.in       | 12 ++++++------
 src/algebra/Makefile.pamphlet | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/algebra')

diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index e2293479..0b47e87a 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1131,7 +1131,7 @@ strap/%.$(FASLEXT): $(srcdir)/strap/%.lsp
 $(OUTSRC)/%.spad: mk-target-src-algabra-dir
 
 ${OUTSRC}/%.spad: $(srcdir)/%.spad.pamphlet
-	$(axiom_build_document) --tangle --output=$@ $<
+	$(oa_hammer) --tangle --output=$@ $<
 
 .PHONY: mk-target-src-algabra-dir
 mk-target-src-algabra-dir:
@@ -1153,10 +1153,10 @@ $(builddir)/%.dvi: $(axiom_build_texdir)/diagrams.tex \
 		   $(axiom_build_texdir)/axiom.sty
 
 $(builddir)/%.dvi: $(builddir)/%.tex
-	$(axiom_build_document) --latex $<
+	$(oa_hammer) --latex $<
 
 $(builddir)/%.tex: $(srcdir)/%.pamphlet
-	$(axiom_build_document) --weave --output=$@ $<
+	$(oa_hammer) --weave --output=$@ $<
 
 $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
 	@cp -p $< $@
@@ -1170,13 +1170,13 @@ PARSER.NRLIB/code.$(FASLEXT): script-parser.spad
 
 
 ${INPUT}/TESTFR.input: $(srcdir)/fr.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST FR' --output=$@ $<
+	$(oa_hammer) --tangle='TEST FR' --output=$@ $<
 
 ${INPUT}/INTHEORY.input: $(srcdir)/numtheor.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST INTHEORY' --output=$@ $<
+	$(oa_hammer) --tangle='TEST INTHEORY' --output=$@ $<
 
 ${INPUT}/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST VIEW2D' --output=$@ $<
+	$(oa_hammer) --tangle='TEST VIEW2D' --output=$@ $<
 
 
 ${DOC}/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 24d15915..210b5165 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1418,13 +1418,13 @@ TESTS=${INPUT}/INTHEORY.input ${INPUT}/VIEW2D.input ${INPUT}/TESTFR.input
 <<testrules>>=
 
 ${INPUT}/TESTFR.input: $(srcdir)/fr.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST FR' --output=$@ $<
+	$(oa_hammer) --tangle='TEST FR' --output=$@ $<
 
 ${INPUT}/INTHEORY.input: $(srcdir)/numtheor.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST INTHEORY' --output=$@ $<
+	$(oa_hammer) --tangle='TEST INTHEORY' --output=$@ $<
 
 ${INPUT}/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet
-	$(axiom_build_document) --tangle='TEST VIEW2D' --output=$@ $<
+	$(oa_hammer) --tangle='TEST VIEW2D' --output=$@ $<
 
 @
 
@@ -1580,7 +1580,7 @@ strap/%.$(FASLEXT): $(srcdir)/strap/%.lsp
 $(OUTSRC)/%.spad: mk-target-src-algabra-dir
 
 ${OUTSRC}/%.spad: $(srcdir)/%.spad.pamphlet
-	$(axiom_build_document) --tangle --output=$@ $<
+	$(oa_hammer) --tangle --output=$@ $<
 
 .PHONY: mk-target-src-algabra-dir
 mk-target-src-algabra-dir:
@@ -1604,10 +1604,10 @@ $(builddir)/%.dvi: $(axiom_build_texdir)/diagrams.tex \
 		   $(axiom_build_texdir)/axiom.sty
 
 $(builddir)/%.dvi: $(builddir)/%.tex
-	$(axiom_build_document) --latex $<
+	$(oa_hammer) --latex $<
 
 $(builddir)/%.tex: $(srcdir)/%.pamphlet
-	$(axiom_build_document) --weave --output=$@ $<
+	$(oa_hammer) --weave --output=$@ $<
 
 $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
 	@cp -p $< $@
@@ -1723,7 +1723,7 @@ the case above this would resolve to [[\${MID}/LEXTRIPK.spad]].
 For the line given above it outputs the following:
 \begin{verbatim}
 ${MID}/LEXTRIPK.spad: $(srcdir)/zerodim.spad.pamphlet
-	$(axiom_build_document) --tangle='package LEXTRIPK LexTriangularPackage' --output=$@ $<
+	$(oa_hammer) --tangle='package LEXTRIPK LexTriangularPackage' --output=$@ $<
 \end{verbatim}
 
 
-- 
cgit v1.2.3