* Makefile.am: Automake Makefile.in.

	* Makefile.in: Regenerate.

10 files changed, 899 insertions, 122 deletions

diff --git a/ChangeLog b/ChangeLog
index 7247a6ad..f0c13ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* config/open-axiom.m4 (axiom_src_all): Remove.
+	(axiom_src_subdirs): Likewise.
+	* configure.ac: Likewise.
+	* Makefile.am (OA_SRC_TARGETS): Include all-local.
+	* Makefile.in: Regenerate.
+
 2010-11-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.am: New.  Automake existing top-level Makefile.in.
diff --git a/Makefile.am b/Makefile.am
index f2777bee..0b410379 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ oa_installdir = @open_axiom_installdir@
 GCLOPTS=@GCLOPTS@
 
 OA_SRC_TARGETS = \
+	all-local \
 	all-src \
 	all-algebra \
 	all-asq \
@@ -75,10 +76,9 @@ OA_SRC_TARGETS = \
 
 if OA_BUILD_GCL
 all-recursive all-boot all-lisp all-interpsys all-axiomsys \
-  all-algebra all-input all-src: all-gcl
+  all-algebra all-input all-src all-local: all-gcl
 endif
 
-all-local: all-src
 $(OA_SRC_TARGETS):
 	cd src && $(MAKE) $@
 
diff --git a/Makefile.in b/Makefile.in
index 246ac92c..79ccf650 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,7 +84,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(top_srcdir)/config/openaxiom-c-macros.h.in \
 	$(top_srcdir)/config/setup-dep.mk \
 	$(top_srcdir)/config/var-def.mk $(top_srcdir)/configure \
-	$(top_srcdir)/src/Makefile.in \
 	$(top_srcdir)/src/algebra/Makefile.in \
 	$(top_srcdir)/src/boot/Makefile.in \
 	$(top_srcdir)/src/clef/Makefile.in \
@@ -120,7 +119,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/openaxiom-c-macros.h
-CONFIG_CLEAN_FILES = src/Makefile src/lib/Makefile src/utils/Makefile \
+CONFIG_CLEAN_FILES = src/lib/Makefile src/utils/Makefile \
 	src/hyper/Makefile src/driver/Makefile src/lisp/Makefile \
 	src/boot/Makefile src/interp/Makefile src/share/Makefile \
 	src/algebra/Makefile src/input/Makefile src/etc/Makefile \
@@ -282,8 +281,6 @@ axiom_eval_flags = @axiom_eval_flags@
 axiom_fasl_type = @axiom_fasl_type@
 axiom_lisp_flavor = @axiom_lisp_flavor@
 axiom_quiet_flags = @axiom_quiet_flags@
-axiom_src_all = @axiom_src_all@
-axiom_src_subdirs = @axiom_src_subdirs@
 axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
@@ -358,6 +355,7 @@ DIST_SUBDIRS = src
 oa_builddir = $(abs_top_builddir)/build/$(target)
 oa_installdir = @open_axiom_installdir@
 OA_SRC_TARGETS = \
+	all-local \
 	all-src \
 	all-algebra \
 	all-asq \
@@ -428,8 +426,6 @@ $(top_srcdir)/config/openaxiom-c-macros.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config/openaxiom-c-macros.h config/stamp-h1
-src/Makefile: $(top_builddir)/config.status $(top_srcdir)/config/var-def.mk $(top_srcdir)/src/Makefile.in $(top_srcdir)/config/setup-dep.mk
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 src/lib/Makefile: $(top_builddir)/config.status $(top_srcdir)/config/var-def.mk $(top_srcdir)/src/lib/Makefile.in $(top_srcdir)/config/setup-dep.mk
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 src/utils/Makefile: $(top_builddir)/config.status $(top_srcdir)/config/var-def.mk $(top_srcdir)/src/utils/Makefile.in $(top_srcdir)/config/setup-dep.mk
@@ -792,7 +788,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile all-local
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install-exec: install-exec-recursive
@@ -893,29 +889,27 @@ uninstall-am:
 	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local am--refresh check check-am clean \
-	clean-generic clean-libtool clean-local ctags ctags-recursive \
-	dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool clean-local ctags ctags-recursive dist dist-all \
+	dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 .PHONY: $(OA_SRC_TARGETS)
 
 @OA_BUILD_GCL_TRUE@all-recursive all-boot all-lisp all-interpsys all-axiomsys \
-@OA_BUILD_GCL_TRUE@  all-algebra all-input all-src: all-gcl
+@OA_BUILD_GCL_TRUE@  all-algebra all-input all-src all-local: all-gcl
 
-all-local: all-src
 $(OA_SRC_TARGETS):
 	cd src && $(MAKE) $@
 
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 3e53c66b..caf6d599 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -828,8 +828,6 @@ oa_use_sman=1
 if test x"$ac_cv_have_decl_fork" = xyes \
      -a x"$ac_cv_have_decl_wait" = xyes; then \
     oa_c_runtime="$oa_c_runtime terminal_io"
-    axiom_src_all="$axiom_src_all all-sman all-clef"
-    axiom_src_subdirs="$axiom_src_subdirs clef sman"
 else
     oa_use_sman=0
     AC_MSG_NOTICE([Superman component is disabled.])
@@ -837,8 +835,6 @@ fi
 
 AC_DEFINE_UNQUOTED([OPENAXIOM_USE_SMAN], [$oa_use_sman],
                    [Whether to use the session manager as driver.])
-
-axiom_src_all="all-input $axiom_src_all"
 ])
 
 
@@ -887,12 +883,9 @@ axiom_use_x=no
 if test -z "$no_x"; then
     axiom_use_x=yes
     oa_c_runtime="$oa_c_runtime graphics"
-    axiom_src_all="$axiom_src_all all-graph"
-    axiom_src_subdirs="$axiom_src_subdirs graph"
 else
     AC_MSG_NOTICE([The Garphics component is disabled.])
 fi
-AC_SUBST(axiom_src_all)
 AC_SUBST(axiom_use_x)
 ])
 
diff --git a/configure b/configure
index 55444457..d8013525 100755
--- a/configure
+++ b/configure
@@ -760,7 +760,6 @@ openaxiom_host_has_regex
 OA_QT_QMAKE
 OA_QT_MOC
 axiom_use_x
-axiom_src_all
 X_CLFAGS
 X_EXTRA_LIBS
 X_LIBS
@@ -771,7 +770,6 @@ OA_BUILD_SMAN_FALSE
 OA_BUILD_SMAN_TRUE
 oa_c_runtime_extra
 oa_c_runtime
-axiom_src_subdirs
 MAKEINDEX
 LATEX
 PDFLATEX
@@ -8500,13 +8498,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:8503: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8501: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8506: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8504: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8509: output\"" >&5)
+  (eval echo "\"\$as_me:8507: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9708,7 +9706,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9711 "configure"' > conftest.$ac_ext
+  echo '#line 9709 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11802,11 +11800,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11805: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11803: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11809: \$? = $ac_status" >&5
+   echo "$as_me:11807: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12141,11 +12139,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12142: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12148: \$? = $ac_status" >&5
+   echo "$as_me:12146: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12246,11 +12244,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12249: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12247: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12253: \$? = $ac_status" >&5
+   echo "$as_me:12251: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12301,11 +12299,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12304: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12302: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12308: \$? = $ac_status" >&5
+   echo "$as_me:12306: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14668,7 +14666,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14671 "configure"
+#line 14669 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14764,7 +14762,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14767 "configure"
+#line 14765 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16720,11 +16718,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16721: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16727: \$? = $ac_status" >&5
+   echo "$as_me:16725: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16819,11 +16817,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16822: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16820: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16826: \$? = $ac_status" >&5
+   echo "$as_me:16824: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16871,11 +16869,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16874: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16872: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16878: \$? = $ac_status" >&5
+   echo "$as_me:16876: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18522,9 +18520,6 @@ done
 
 
 
-axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
-
-
 
 oa_c_runtime=
 
@@ -19287,8 +19282,6 @@ oa_use_sman=1
 if test x"$ac_cv_have_decl_fork" = xyes \
      -a x"$ac_cv_have_decl_wait" = xyes; then \
     oa_c_runtime="$oa_c_runtime terminal_io"
-    axiom_src_all="$axiom_src_all all-sman all-clef"
-    axiom_src_subdirs="$axiom_src_subdirs clef sman"
 else
     oa_use_sman=0
     { $as_echo "$as_me:${as_lineno-$LINENO}: Superman component is disabled." >&5
@@ -19301,8 +19294,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-axiom_src_all="all-input $axiom_src_all"
-
  if test $oa_use_sman = 1; then
   OA_BUILD_SMAN_TRUE=
   OA_BUILD_SMAN_FALSE='#'
@@ -20021,8 +20012,6 @@ axiom_use_x=no
 if test -z "$no_x"; then
     axiom_use_x=yes
     oa_c_runtime="$oa_c_runtime graphics"
-    axiom_src_all="$axiom_src_all all-graph"
-    axiom_src_subdirs="$axiom_src_subdirs graph"
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: The Garphics component is disabled." >&5
 $as_echo "$as_me: The Garphics component is disabled." >&6;}
@@ -20030,7 +20019,6 @@ fi
 
 
 
-
 # Check for Qt utilities.
 for ac_prog in moc
 do
@@ -20388,9 +20376,7 @@ esac
 
 
 ## We are ready to instantiate makefiles.
-ac_config_files="$ac_config_files Makefile"
-
-ac_config_files="$ac_config_files src/Makefile:config/var-def.mk:src/Makefile.in:config/setup-dep.mk"
+ac_config_files="$ac_config_files Makefile src/Makefile"
 
 ac_config_files="$ac_config_files src/lib/Makefile:config/var-def.mk:src/lib/Makefile.in:config/setup-dep.mk"
 
@@ -21520,7 +21506,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile:config/var-def.mk:src/Makefile.in:config/setup-dep.mk" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile:config/var-def.mk:src/lib/Makefile.in:config/setup-dep.mk" ;;
     "src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/Makefile:config/var-def.mk:src/utils/Makefile.in:config/setup-dep.mk" ;;
     "src/hyper/Makefile") CONFIG_FILES="$CONFIG_FILES src/hyper/Makefile:config/var-def.mk:src/hyper/Makefile.in:config/setup-dep.mk" ;;
diff --git a/configure.ac b/configure.ac
index 2ca1ac76..710ed658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,9 +91,6 @@ OPENAXIOM_FILE_EXTENSIONS
 OPENAXIOM_BUILD_OPTIONS
 OPENAXIOM_HOST_PROGS
 
-axiom_src_subdirs="lib hyper lisp boot interp share algebra input etc doc"
-AC_SUBST(axiom_src_subdirs)
-
 OPENAXIOM_CHECK_CORE_SUPPORT
 OPENAXIOM_CHECK_IO
 AM_CONDITIONAL([OA_BUILD_SMAN], [test $oa_use_sman = 1])
@@ -106,8 +103,7 @@ OPENAXIOM_CHECK_MM
 OPENAXIOM_CHECK_MISC
 
 ## We are ready to instantiate makefiles.
-AC_CONFIG_FILES([Makefile])
-OPENAXIOM_MAKEFILE([src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile])
 OPENAXIOM_MAKEFILE([src/lib/Makefile])
 OPENAXIOM_MAKEFILE([src/utils/Makefile])
 OPENAXIOM_MAKEFILE([src/hyper/Makefile])
diff --git a/src/ChangeLog b/src/ChangeLog
index 52df643c..fbe3d25a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.am: Automake Makefile.in.
+	* Makefile.in: Regenerate.
+
 2010-11-19  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* driver/utils.c (openaxiom_allocate_argv): New.
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..60024a43
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,138 @@
+# Copyright (C) 2010, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     - Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#
+#     - Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in
+#       the documentation and/or other materials provided with the
+#       distribution.
+#
+#     - Neither the name of The Numerical Algorithms Group Ltd. nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+DIST_SUBDIRS = \
+	algebra boot clef doc \
+	driver etc graph hyper \
+	include input interp lib \
+	lisp scripts share sman \
+	testsuite utils
+
+oa_targetdir = $(top_builddir)/$(target)
+
+OA_OPTIONAL_TARGETS=
+if OA_BUILD_SMAN
+OA_OPTIONAL_TARGETS += all-sman all-clef
+endif
+
+if OA_BUILD_GRAPHICS
+OA_OPTIONAL_TARGETS += all-graph
+endif
+
+
+all-local: all-src
+
+.PHONY: all-src
+all-src: all-lib all-utils all-driver all-lisp all-boot \
+	all-interpsys all-algebra all-axiomsys all-share \
+	all-asq all-input all-doc $(OA_OPTIONAL_TARGETS)
+
+stamp-subdirs:
+	rm -f stamp-subdirs
+	$(MKDIR_P) $(oa_targetdir)/bin
+	$(MKDIR_P) $(oa_targetdir)/lib
+	$(MKDIR_P) $(oa_targetdir)/share
+	$(MKDIR_P) $(oa_targetdir)/doc
+	$(MKDIR_P) $(oa_targetdir)/doc/help
+	$(MKDIR_P) $(oa_targetdir)/autoload
+	$(MKDIR_P) algebra/strap
+	touch stamp-subdirs
+
+.PHONY: $(oa_all_targets)
+
+all-driver: all-lib
+	cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-utils: stamp-subdirs
+	cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-clef: all-lib
+	cd clef && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-sman: all-lib all-driver
+	cd sman && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-hyper: all-lib
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-share:
+	cd share && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-doc
+all-doc: stamp-subdirs
+	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-lib: stamp-subdirs
+	cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-lisp: all-lib
+	cd lisp && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-boot: all-lisp
+	cd boot && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-interpsys: all-boot all-hyper-pre all-utils
+	cd interp && ${MAKE} $(AM_MAKEFLAGS) all-interpsys
+
+all-axiomsys: all-asq
+	cd interp && $(MAKE) $(AM_MAKEFLAGS) all-axiomsys
+
+all-algebra: all-interpsys all-share all-hyper-pre
+	cd algebra && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-hyper-pre
+all-hyper-pre: all-lib
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) all-hyper-pre
+
+all-input: all-axiomsys all-doc
+	cd input && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-asq: all-hyper-post all-utils
+	cd etc && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-databases
+all-databases:  all-interp all-doc
+	cd etc && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-hyper-post
+all-hyper-post: all-algebra  all-doc
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) all-hyper-post
+
+all-graph: all-lib
+	cd graph && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-check
+all-check:
+	cd input && $(MAKE) $(AM_MAKEFLAGS) all-check
+
+mostlyclean-local:
+	-rm -f stamp-subdirs
diff --git a/src/Makefile.in b/src/Makefile.in
index a50866c8..0d210a20 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,83 +1,740 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
 
-pamphlets = Makefile.pamphlet
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-subdir = src/
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-SUBDIRS = @axiom_src_subdirs@
+@SET_MAKE@
 
-.PHONY: all all-ax all-src all-clef all-sman all-driver all-utils
+# Copyright (C) 2010, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     - Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#
+#     - Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in
+#       the documentation and/or other materials provided with the
+#       distribution.
+#
+#     - Neither the name of The Numerical Algorithms Group Ltd. nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@OA_BUILD_SMAN_TRUE@am__append_1 = all-sman all-clef
+@OA_BUILD_GRAPHICS_TRUE@am__append_2 = all-graph
+subdir = src
+SUBDIRS =
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+am__aclocal_m4_deps = $(top_srcdir)/config/aclocal.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/open-axiom.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config/openaxiom-c-macros.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+AXIOM_LISP = @AXIOM_LISP@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GCLOPTS = @GCLOPTS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINDEX = @MAKEINDEX@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKTEMP = @MKTEMP@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OA_QT_MOC = @OA_QT_MOC@
+OA_QT_QMAKE = @OA_QT_QMAKE@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_CLFAGS = @X_CLFAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+axiom_cflags = @axiom_cflags@
+axiom_eval_flags = @axiom_eval_flags@
+axiom_fasl_type = @axiom_fasl_type@
+axiom_lisp_flavor = @axiom_lisp_flavor@
+axiom_quiet_flags = @axiom_quiet_flags@
+axiom_use_x = @axiom_use_x@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+char_type = @char_type@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+double_type = @double_type@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+float_type = @float_type@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+int_type = @int_type@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libext = @libext@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oa_c_runtime = @oa_c_runtime@
+oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_editor = @oa_editor@
+oa_enable_checking = @oa_enable_checking@
+oa_enable_profiling = @oa_enable_profiling@
+oa_enable_threads = @oa_enable_threads@
+oa_keep_files = @oa_keep_files@
+oa_optimize_options = @oa_optimize_options@
+oa_shrlib_flags = @oa_shrlib_flags@
+oa_shrobj_flags = @oa_shrobj_flags@
+oa_standard_linking = @oa_standard_linking@
+oa_use_dynamic_lib = @oa_use_dynamic_lib@
+oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oldincludedir = @oldincludedir@
+open_axiom_installdir = @open_axiom_installdir@
+openaxiom_host_has_regex = @openaxiom_host_has_regex@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+shared_ext = @shared_ext@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+string_type = @string_type@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+void_type = @void_type@
+DIST_SUBDIRS = \
+	algebra boot clef doc \
+	driver etc graph hyper \
+	include input interp lib \
+	lisp scripts share sman \
+	testsuite utils
 
-all: all-ax
+oa_targetdir = $(top_builddir)/$(target)
+OA_OPTIONAL_TARGETS = $(am__append_1) $(am__append_2)
+all: all-recursive
 
-all-ax all-src: stamp
-	@echo finished $(builddir)
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
 
-stamp: @axiom_src_all@ all-driver
-	-rm -f stamp
-	$(STAMP) stamp
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+all-local: all-src
+
+.PHONY: all-src
+all-src: all-lib all-utils all-driver all-lisp all-boot \
+	all-interpsys all-algebra all-axiomsys all-share \
+	all-asq all-input all-doc $(OA_OPTIONAL_TARGETS)
+
+stamp-subdirs:
+	rm -f stamp-subdirs
+	$(MKDIR_P) $(oa_targetdir)/bin
+	$(MKDIR_P) $(oa_targetdir)/lib
+	$(MKDIR_P) $(oa_targetdir)/share
+	$(MKDIR_P) $(oa_targetdir)/doc
+	$(MKDIR_P) $(oa_targetdir)/doc/help
+	$(MKDIR_P) $(oa_targetdir)/autoload
+	$(MKDIR_P) algebra/strap
+	touch stamp-subdirs
+
+.PHONY: $(oa_all_targets)
 
 all-driver: all-lib
-	@cd driver && $(MAKE) $@
+	cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
 
-all-utils:
-	@cd utils && $(MAKE) $@
+all-utils: stamp-subdirs
+	cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
 
 all-clef: all-lib
-	@$(mkdir_p) "$(axiom_target_bindir)"
-	cd clef && $(MAKE) $@
+	cd clef && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-sman: all-lib all-driver
-	$(mkdir_p) "$(axiom_target_bindir)"
-	$(mkdir_p) "$(axiom_target_libdir)"
-	cd sman && $(MAKE) $@
+	cd sman && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-hyper: all-lib
-	$(mkdir_p) "$(axiom_target_bindir)"
-	$(mkdir_p) "$(axiom_target_datadir)"
-	cd hyper && $(MAKE) $@
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-share:
-	$(mkdir_p) "$(axiom_target_libdir)"
-	cd share && $(MAKE) $@
-all-doc:
-	$(mkdir_p) "$(axiom_target_docdir)"/help && cd doc && $(MAKE) $@
-all-lib:
-	@cd lib && $(MAKE) $@
+	cd share && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: all-doc
+all-doc: stamp-subdirs
+	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
+
+all-lib: stamp-subdirs
+	cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-lisp: all-lib
-	cd lisp && $(MAKE) all-lisp
+	cd lisp && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-boot: all-lisp
-	@cd boot && $(MAKE) $@
+	cd boot && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-interpsys: all-boot all-hyper-pre all-utils
-	cd interp && ${MAKE} all-interpsys
+	cd interp && ${MAKE} $(AM_MAKEFLAGS) all-interpsys
 
 all-axiomsys: all-asq
-	cd interp && $(MAKE) all-axiomsys
+	cd interp && $(MAKE) $(AM_MAKEFLAGS) all-axiomsys
+
 all-algebra: all-interpsys all-share all-hyper-pre
-	@ $(mkdir_p) algebra/strap
-	cd algebra && $(MAKE) $@
+	cd algebra && $(MAKE) $(AM_MAKEFLAGS) $@
 
+.PHONY: all-hyper-pre
 all-hyper-pre: all-lib
-	cd hyper && $(MAKE) all-hyper-pre
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) all-hyper-pre
+
 all-input: all-axiomsys all-doc
-	cd input && ${MAKE}
+	cd input && $(MAKE) $(AM_MAKEFLAGS) $@
+
 all-asq: all-hyper-post all-utils
-	cd etc && $(MAKE) $@
+	cd etc && $(MAKE) $(AM_MAKEFLAGS) $@
 
 .PHONY: all-databases
-all-databases:  all-interpsys all-doc
-	cd etc && $(MAKE) $@
+all-databases:  all-interp all-doc
+	cd etc && $(MAKE) $(AM_MAKEFLAGS) $@
 
+.PHONY: all-hyper-post
 all-hyper-post: all-algebra  all-doc
-	cd hyper && $(MAKE) all-hyper-post
+	cd hyper && $(MAKE) $(AM_MAKEFLAGS) all-hyper-post
+
 all-graph: all-lib
-	cd graph && $(MAKE) $@
+	cd graph && $(MAKE) $(AM_MAKEFLAGS) $@
 
 .PHONY: all-check
 all-check:
-	cd input && $(MAKE) all-check
+	cd input && $(MAKE) $(AM_MAKEFLAGS) all-check
 
 mostlyclean-local:
-	-rm -f stamp
-
-clean-local: mostlyclean-local
-
-distclean-local: clean-local
+	-rm -f stamp-subdirs
 
-install:
+# 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:
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 995ba24b..32bc13c5 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -379,7 +379,7 @@ server.$(FASLEXT): macros.$(FASLEXT)
 ## While in theory that should work, in practice it turns out that 
 ## people tend to override functions in the autoload part, correcting
 ## bugs only there.  The consequence is that the same function will
-## bahave very differently based on the history of the seesion.  Ideal
+## behave very differently based on the history of the seesion.  Ideal
 ## recipe for creating heisenbugs.
 ##