aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-13 21:25:59 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-13 21:25:59 +0000
commit4286b31e929535c13afd49b8118a047d8d62492e (patch)
treeb3c863ebb16585983232c98f4bc70c7e4c7beafb
parent64b66aef8e4e9e83216ccaf9d147809a510fd674 (diff)
downloadopen-axiom-4286b31e929535c13afd49b8118a047d8d62492e.tar.gz
* interp/Makefile.pamphlet (OBJS): Don't include union.$(FASLEXT)
twice. (ASCOMP): Don't include here.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/interp/Makefile.in5
-rw-r--r--src/interp/Makefile.pamphlet5
3 files changed, 10 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b5720b1..a6f67eaf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2008-08-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/Makefile.pamphlet (OBJS): Don't include union.$(FASLEXT)
+ twice.
+ (ASCOMP): Don't include here.
+
+2008-08-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* input/expr.input.pamphlet: Fix typo.
2008-08-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 0f4f7bc9..0cee42fb 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -86,7 +86,7 @@ OBJS= boot-pkg.$(FASLEXT) types.$(FASLEXT) \
spaderror.$(FASLEXT) \
template.$(FASLEXT) termrw.$(FASLEXT) \
trace.$(FASLEXT) \
- union.$(FASLEXT) daase.$(FASLEXT) \
+ daase.$(FASLEXT) \
fortcall.$(FASLEXT) \
$(OCOBJS) \
$(BROBJS) i-parser.$(FASLEXT)
@@ -128,8 +128,7 @@ TRANOBJS= ${AUTO}/wi1.$(FASLEXT) ${AUTO}/wi2.$(FASLEXT) ${AUTO}/pspad1.$(FASLEXT
autoload_objects += $(TRANOBJS)
-ASCOMP= hashcode.$(FASLEXT) as.$(FASLEXT) \
- foam_l.$(FASLEXT) axext_l.$(FASLEXT)
+ASCOMP= hashcode.$(FASLEXT) as.$(FASLEXT) axext_l.$(FASLEXT)
AS_modules = $(patsubst %.$(FASLEXT), "%", $(ASCOMP))
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 4bfe1af0..9f915ac2 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -165,7 +165,7 @@ OBJS= boot-pkg.$(FASLEXT) types.$(FASLEXT) \
spaderror.$(FASLEXT) \
template.$(FASLEXT) termrw.$(FASLEXT) \
trace.$(FASLEXT) \
- union.$(FASLEXT) daase.$(FASLEXT) \
+ daase.$(FASLEXT) \
fortcall.$(FASLEXT) \
$(OCOBJS) \
$(BROBJS) i-parser.$(FASLEXT)
@@ -265,8 +265,7 @@ autoload_objects += $(TRANOBJS)
The {\bf ASCOMP} list contains files used by the {\bf Aldor}
\cite{5} compiler. These files should probably be autoloaded.
<<environment>>=
-ASCOMP= hashcode.$(FASLEXT) as.$(FASLEXT) \
- foam_l.$(FASLEXT) axext_l.$(FASLEXT)
+ASCOMP= hashcode.$(FASLEXT) as.$(FASLEXT) axext_l.$(FASLEXT)
AS_modules = $(patsubst %.$(FASLEXT), "%", $(ASCOMP))