aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--config/open-axiom.m44
-rw-r--r--config/setup-dep.mk16
-rw-r--r--config/var-def.mk65
-rwxr-xr-xconfigure32
-rw-r--r--configure.ac2
-rw-r--r--src/ChangeLog22
-rw-r--r--src/boot/Makefile.in16
-rw-r--r--src/clef/Makefile.in10
-rw-r--r--src/doc/Makefile.in6
-rw-r--r--src/driver/Makefile.in4
-rw-r--r--src/etc/Makefile.in60
-rw-r--r--src/graph/Gdraws/Makefile.in26
-rw-r--r--src/graph/Makefile.in6
-rw-r--r--src/graph/view2D/Makefile.in12
-rw-r--r--src/graph/view3D/Makefile.in14
-rw-r--r--src/graph/viewAlone/Makefile.in12
-rw-r--r--src/graph/viewman/Makefile.in16
-rw-r--r--src/hyper/Makefile.in12
-rw-r--r--src/include/FileMapping.H3
-rw-r--r--src/input/Makefile.in12
-rw-r--r--src/interp/Makefile.in48
-rw-r--r--src/lib/Makefile.in16
-rw-r--r--src/lisp/Makefile.in6
-rw-r--r--src/share/Makefile.in12
-rw-r--r--src/sman/Makefile.in8
-rw-r--r--src/utils/Makefile.in8
27 files changed, 247 insertions, 208 deletions
diff --git a/ChangeLog b/ChangeLog
index 36816a0f..0b94f152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-03 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * config/open-axiom.m4: Clean up global variable names.
+ * config/setup-dep.mk: Likewise.
+ * config/var-def.mk: Likewise.
+ * configure.ac: Likewise.
+
2014-02-02 Gabriel Dos Reis <gdr@integrable-solutions.net>
* config/open-axiom.m4 (OPENAXIOM_CHECK_IO): Prefer mktemp,
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 410923b1..e25b609a 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -119,7 +119,7 @@ case $oa_include_gcl,$AXIOM_LISP in
## User may explicilty specify --enable-gcl, but may be missing
## the dependency tarball.
if test -d ${srcdir}/gcl; then
- AXIOM_LISP='$(axiom_build_bindir)/gcl'
+ AXIOM_LISP='$(oa_build_bindir)/gcl'
oa_include_gcl=yes
elif test -z "$oa_include_gcl"; then
AC_MSG_ERROR([OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, ECL, CLisp, Clozure CL), or get the dependency tarball from OpenAxiom download website.])
@@ -182,6 +182,8 @@ else
esac
fi
AC_MSG_RESULT([$axiom_lisp_flavor])
+AM_CONDITIONAL([OA_ECL_RT],[test $axiom_lisp_flavor = ecl])
+AM_CONDITIONAL([OA_STANDARD_LINKING],[test $oa_standard_linking = yes])
AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS],
[Runtime::${axiom_lisp_flavor}],
diff --git a/config/setup-dep.mk b/config/setup-dep.mk
index 939da9b5..7e7731fe 100644
--- a/config/setup-dep.mk
+++ b/config/setup-dep.mk
@@ -79,23 +79,23 @@ maintainer-clean-recursive:
.PRECIOUS: %.tex
.PRECIOUS: %.dvi
-DVI_FILES = $(addprefix $(axiom_target_docdir)/$(subdir), \
+DVI_FILES = $(addprefix $(oa_target_docdir)/$(subdir), \
$(pamphlets:.pamphlet=.dvi))
pamphlets_SOURCES = $(addprefix $(srcdir)/, $(pamphlets))
.PHONY: dvi dvi-ax
dvi: dvi-recursive
-dvi-ax: $(axiom_build_texdir)/axiom.sty $(DVI_FILES)
+dvi-ax: $(oa_build_texdir)/axiom.sty $(DVI_FILES)
-$(axiom_target_docdir)/$(subdir)%.dvi: $(builddir)/%.dvi
- $(mkinstalldirs) $(axiom_target_docdir)/$(subdir)
+$(oa_target_docdir)/$(subdir)%.dvi: $(builddir)/%.dvi
+ $(mkinstalldirs) $(oa_target_docdir)/$(subdir)
$(INSTALL_DATA) $< $@
-%.dvi: %.tex $(axiom_build_texdir)/axiom.sty
- TEXINPUTS=".:$(axiom_build_texdir):$${TEXINPUTS}"; \
+%.dvi: %.tex $(oa_build_texdir)/axiom.sty
+ TEXINPUTS=".:$(oa_build_texdir):$${TEXINPUTS}"; \
export TEXINPUTS; \
- BIBINPUTS=".:$(axiom_build_texdir):$${TEXINPUTS}"; \
+ BIBINPUTS=".:$(oa_build_texdir):$${TEXINPUTS}"; \
export BIBINPUTS; \
$(oa_hammer) --latex $<
@@ -135,7 +135,7 @@ clean-ax: clean-generic clean-local
.PHONY: distclean-generic distclean-local distclean distclean-ax
distclean-generic: clean-generic
- @-rm -rf $(axiom_target_docdir)/$(subdir)
+ @-rm -rf $(oa_target_docdir)/$(subdir)
distclean: distclean-recursive
distclean-ax: distclean-generic distclean-local
diff --git a/config/var-def.mk b/config/var-def.mk
index b89d3c88..be1ef880 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -98,7 +98,6 @@ endif
oa_shrobj_flags = @oa_shrobj_flags@
oa_shrlib_flags = @oa_shrlib_flags@
-AUTOCONF = autoconf
AWK = @AWK@
INSTALL = @INSTALL@
install_sh = @install_sh@
@@ -115,7 +114,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
## we are explicitly overrding that value here.
LN_S = ln -s
mkinstalldirs = $(top_srcdir)/config/mkinstalldirs
-PATCH = @PATCH@
RANLIB = @RANLIB@
TOUCH = @TOUCH@
@@ -154,34 +152,21 @@ oa_standard_linking = @oa_standard_linking@
## Notice, this is the src/ directory within the toplevel source
## directory
-axiom_src_srcdir = $(top_srcdir)/src
-axiom_src_docdir = $(axiom_src_srcdir)/doc
-axiom_src_datadir = $(axiom_src_srcdir)/share
-axiom_src_algdir = $(axiom_src_srcdir)/algebra
-axiom_src_texdir = $(axiom_src_datadir)/tex
+oa_src_srcdir = $(top_srcdir)/src
+oa_src_docdir = $(oa_src_srcdir)/doc
+oa_src_datadir = $(oa_src_srcdir)/share
+oa_src_algdir = $(oa_src_srcdir)/algebra
+oa_src_texdir = $(oa_src_datadir)/tex
## Where tools for the build machine are built
-# Tools that we occasionally build don't know
-# much about Autoconf and related infrastructure. Therefore
-# we do lot by "hand". For the moment, things work if we specify
-# paths as absolute, as opposed to relative. Other parts of
-# OpenAxiom also expect absolute paths.
-axiom_abs_top_builddir = $(abs_top_builddir)
-axiom_abs_builddir = $(abs_top_builddir)/build/$(build)
-axiom_abs_build_bindir = $(axiom_abs_builddir)/bin
-axiom_abs_build_libdir = $(axiom_abs_builddir)/lib
-axiom_abs_build_mandir = $(axiom_abs_builddir)/man
-axiom_abs_build_datadir = $(axiom_abs_builddir)/share
-axiom_abs_build_texdir = $(axiom_abs_build_datadir)/texmf/tex
-
axiom_top_builddir = $(top_builddir)/build
-axiom_builddir = $(axiom_top_builddir)/$(build)
-axiom_build_bindir = $(axiom_builddir)/bin
-axiom_build_libdir = $(axiom_builddir)/lib
-axiom_build_mandir = $(axiom_builddir)/man
-axiom_build_docdir = $(axiom_builddir)/doc
-axiom_build_datadir = $(axiom_builddir)/share
-axiom_build_texdir = $(axiom_build_datadir)/texmf/tex
+oa_builddir = $(axiom_top_builddir)/$(build)
+oa_build_bindir = $(oa_builddir)/bin
+oa_build_libdir = $(oa_builddir)/lib
+oa_build_mandir = $(oa_builddir)/man
+oa_build_docdir = $(oa_builddir)/doc
+oa_build_datadir = $(oa_builddir)/share
+oa_build_texdir = $(oa_build_datadir)/texmf/tex
axiom_configdir = $(top_builddir)/config
axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h
@@ -189,14 +174,14 @@ axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h
LATEX = @LATEX@
## Staging directory for the target DESTDIR
-axiom_targetdir = $(top_builddir)/$(target)
-axiom_target_bindir = $(axiom_targetdir)/bin
-axiom_target_libdir = $(axiom_targetdir)/lib
-axiom_target_srcdir = $(axiom_targetdir)/src
-axiom_target_docdir = $(axiom_targetdir)/doc
-axiom_target_datadir = $(axiom_targetdir)/share
-axiom_target_texdir = $(axiom_target_datadir)/texmf/tex
-oa_target_includedir = $(axiom_targetdir)/include
+oa_targetdir = $(top_builddir)/$(target)
+oa_target_bindir = $(oa_targetdir)/bin
+oa_target_libdir = $(oa_targetdir)/lib
+oa_target_srcdir = $(oa_targetdir)/src
+oa_target_docdir = $(oa_targetdir)/doc
+oa_target_datadir = $(oa_targetdir)/share
+oa_target_texdir = $(oa_target_datadir)/texmf/tex
+oa_target_includedir = $(oa_targetdir)/include
## The final directory where OpenAxiom is installed. This is usually
@@ -219,13 +204,13 @@ axiom_use_x = @axiom_use_x@
AXIOM_X11_CFLAGS = @X_CFLAGS@
AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
-axiom_includes = -I$(axiom_src_srcdir)/include -I$(axiom_configdir)
+axiom_includes = -I$(oa_src_srcdir)/include -I$(axiom_configdir)
## Where the staging build directory is found
AXIOM = $(top_builddir)/$(target)
## Where to find OpenAxiom data bases.
-DAASE = $(axiom_src_datadir)
+DAASE = $(oa_src_datadir)
## -------------------------------------------
## -- Files generated for the build machine --
@@ -250,11 +235,5 @@ endif
OA_QT_MOC = @OA_QT_MOC@
OA_QT_QMAKE = @OA_QT_QMAKE@
-##
-AXIOMXLROOT=${AXIOM}/compiler
-
-## Lisp command to end a session.
-BYE=bye
-
## Clear suffix-based implicit rule table.
.SUFFIXES:
diff --git a/configure b/configure
index 1c674e1f..f7398aa6 100755
--- a/configure
+++ b/configure
@@ -737,6 +737,10 @@ LDFLAGS
CFLAGS
CC
oa_delay_ffi
+OA_STANDARD_LINKING_FALSE
+OA_STANDARD_LINKING_TRUE
+OA_ECL_RT_FALSE
+OA_ECL_RT_TRUE
oa_standard_linking
axiom_lisp_flavor
AXIOM_LISP
@@ -3750,7 +3754,7 @@ esac
## cross build. Consequently, in the build tree, we sequester
## tools that we build and use on the build platform,
## in sub-directories different from others.
-axiom_build_sharedir=$axiom_builddir/share
+oa_build_sharedir=$oa_builddir/share
## We have now almost switched entirely to C++.
ac_ext=cpp
@@ -3915,7 +3919,7 @@ case $oa_include_gcl,$AXIOM_LISP in
## User may explicilty specify --enable-gcl, but may be missing
## the dependency tarball.
if test -d ${srcdir}/gcl; then
- AXIOM_LISP='$(axiom_build_bindir)/gcl'
+ AXIOM_LISP='$(oa_build_bindir)/gcl'
oa_include_gcl=yes
elif test -z "$oa_include_gcl"; then
as_fn_error $? "OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, ECL, CLisp, Clozure CL), or get the dependency tarball from OpenAxiom download website." "$LINENO" 5
@@ -3973,6 +3977,22 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $axiom_lisp_flavor" >&5
$as_echo "$axiom_lisp_flavor" >&6; }
+ if test $axiom_lisp_flavor = ecl; then
+ OA_ECL_RT_TRUE=
+ OA_ECL_RT_FALSE='#'
+else
+ OA_ECL_RT_TRUE='#'
+ OA_ECL_RT_FALSE=
+fi
+
+ if test $oa_standard_linking = yes; then
+ OA_STANDARD_LINKING_TRUE=
+ OA_STANDARD_LINKING_FALSE='#'
+else
+ OA_STANDARD_LINKING_TRUE='#'
+ OA_STANDARD_LINKING_FALSE=
+fi
+
cat >>confdefs.h <<_ACEOF
@@ -20204,6 +20224,14 @@ else
am__EXEEXT_FALSE=
fi
+if test -z "${OA_ECL_RT_TRUE}" && test -z "${OA_ECL_RT_FALSE}"; then
+ as_fn_error $? "conditional \"OA_ECL_RT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${OA_STANDARD_LINKING_TRUE}" && test -z "${OA_STANDARD_LINKING_FALSE}"; then
+ as_fn_error $? "conditional \"OA_STANDARD_LINKING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index cb812f8d..a14fac42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ OPENAXIOM_SHELLS
## cross build. Consequently, in the build tree, we sequester
## tools that we build and use on the build platform,
## in sub-directories different from others.
-axiom_build_sharedir=$axiom_builddir/share
+oa_build_sharedir=$oa_builddir/share
## We have now almost switched entirely to C++.
AC_LANG([C++])
diff --git a/src/ChangeLog b/src/ChangeLog
index 6faf0d71..9539d349 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2014-02-03 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * boot/Makefile.in: Fix global variable names.
+ * clef/Makefile.in: Likewise.
+ * doc/Makefile.in: Likewise.
+ * driver/Makefile.in: Likewise.
+ * etc/Makefile.in: Likewise.
+ * graph/Gdraws/Makefile.in: Likewise.
+ * graph/Makefile.in: Likewise.
+ * graph/view2D/Makefile.in: Likewise.
+ * graph/view3D/Makefile.in: Likewise.
+ * graph/viewAlone/Makefile.in: Likewise.
+ * graph/viewman/Makefile.in: Likewise.
+ * hyper/Makefile.in: Likewise.
+ * input/Makefile.in: Likewise.
+ * interp/Makefile.in: Likewise.
+ * lib/Makefile.in: Likewise.
+ * lisp/Makefile.in: Likewise.
+ * share/Makefile.in: Likewise.
+ * sman/Makefile.in: Likewise.
+ * utils/Makefile.in: Likewise.
+
2014-02-02 Gabriel Dos Reis <gdr@integrable-solutions.net>
* Makefile.am (all-gui): Depend on all-syntax.
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 271190a7..8900e7ff 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -57,7 +57,7 @@ boot_SOURCES = utility.boot tokens.boot includer.boot scanner.boot \
boot_clisp = $(boot_SOURCES:.boot=.clisp)
boot_objects = $(boot_SOURCES:.boot=.$(LNKEXT))
-oa_target_bootdir = $(axiom_targetdir)/boot
+oa_target_bootdir = $(oa_targetdir)/boot
ifeq (@axiom_lisp_flavor@,ecl)
oa_boot_linkset = $(oa_target_bootdir)/linkset
else
@@ -75,11 +75,11 @@ subdir = src/boot/
.PHONY: all-boot
all: all-boot
-all-boot: $(axiom_target_bindir)/bootsys$(EXEEXT) $(oa_boot_linkset)
+all-boot: $(oa_target_bindir)/bootsys$(EXEEXT) $(oa_boot_linkset)
## The final `bootsys' image.
-$(axiom_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
- $(mkdir_p) $(axiom_target_bindir)
+$(oa_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
+ $(mkdir_p) $(oa_target_bindir)
cp -p $< $@
$(oa_boot_linkset): $(addprefix $(oa_target_bootdir)/, $(boot_objects))
@@ -112,7 +112,7 @@ strap/stamp: strap/bootsys$(EXEEXT)
strap/bootsys$(EXEEXT): $(strap_boot_objects)
$(DRIVER) --execpath=$(AXIOM_LOCAL_LISP) --make --main="|AxiomCore|::|topLevel|"\
- --system=$(axiom_targetdir) \
+ --system=$(oa_targetdir) \
--prologue='(pushnew :open-axiom-boot *features*)' \
--output=$@ --load-directory=strap $(strap_boot_objects)
@@ -138,7 +138,7 @@ stage1/stamp: stage1/bootsys$(EXEEXT)
stage1/bootsys$(EXEEXT): $(stage1_boot_objects)
$(DRIVER) --execpath=$(AXIOM_LOCAL_LISP) --make --main="|AxiomCore|::|topLevel|" \
- --system=$(axiom_targetdir) \
+ --system=$(oa_targetdir) \
--prologue='(pushnew :open-axiom-boot *features*)' \
--output=$@ --load-directory=stage1 $(stage1_boot_objects)
@@ -165,7 +165,7 @@ stage2/stamp: stage2/bootsys$(EXEEXT)
stage2/bootsys$(EXEEXT): $(stage2_boot_objects)
$(DRIVER) --execpath=$(AXIOM_LOCAL_LISP) --make --main="|AxiomCore|::|topLevel|" \
- --system=$(axiom_targetdir) \
+ --system=$(oa_targetdir) \
--prologue='(pushnew :open-axiom-boot *features*)' \
--output=$@ --load-directory=stage2 $(stage2_boot_objects)
@@ -218,7 +218,7 @@ stage2/%.clisp: %.boot stage1/stamp stage2/.started
##
mostlyclean-local:
- @rm -f $(axiom_target_bindir)/bootsys$(EXEEXT)
+ @rm -f $(oa_target_bindir)/bootsys$(EXEEXT)
@rm -rf prev-stage
@rm -rf strap stage1 stage2
@rm -rf $(oa_target_bootdir)
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index 51b291dc..eaf7cabe 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
# this is where the include files live
-INC= $(axiom_src_srcdir)/include
+INC= $(oa_src_srcdir)/include
bin_PROGRAMS = clef$(EXEEXT)
@@ -53,11 +53,11 @@ all: all-ax
all-ax all-clef: stamp
@ echo finished $(builddir)
-stamp: $(axiom_target_bindir)/clef$(EXEEXT)
+stamp: $(oa_target_bindir)/clef$(EXEEXT)
@rm -f stamp
$(STAMP) stamp
-$(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
+$(oa_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
$(CXXLINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
.SUFFIXES:
@@ -75,7 +75,7 @@ mostlyclean-local:
@rm -f stamp
clean-local: mostlyclean-local
- @rm -f $(axiom_target_bindir)/clef$(EXEEXT)
+ @rm -f $(oa_target_bindir)/clef$(EXEEXT)
distclean-local: clean-local
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index e5af57bb..6ee272f9 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-IN=$(axiom_src_srcdir)/doc
-OUT=$(axiom_target_docdir)
+IN=$(oa_src_srcdir)/doc
+OUT=$(oa_target_docdir)
STY=${OUT}/tex
subdir = src/doc/
diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in
index 5db6e056..5f2a6676 100644
--- a/src/driver/Makefile.in
+++ b/src/driver/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@ open_axiom_objects = $(open_axiom_SOURCES:.cc=.lo)
## Ideally, we want a standalone binary driver unencounbered by
## any sort of dependencies. However, static program linking is not
## available on all plaforms (think Mac OS, Solaris, etc.) So we must link
-## against library archives. Thefore we avoid using $(axiom_target_libdir)
+## against library archives. Thefore we avoid using $(oa_target_libdir)
## below. On purpose.
open_axiom_LDADD = \
-L$(builddir)/../utils \
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
index 211b41eb..17f7407e 100644
--- a/src/etc/Makefile.in
+++ b/src/etc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -34,16 +34,16 @@ DRIVER = ../driver/open-axiom$(EXEEX)
INTERPSYS = \
$(DRIVER) --execpath=../interp/interpsys$(EXEEXT) \
--system="$(AXIOM)" \
- --sysdb="$(axiom_src_datadir)/algebra/"
+ --sysdb="$(oa_src_datadir)/algebra/"
openaxiom_databases = \
- $(addprefix $(axiom_targetdir)/algebra/, \
+ $(addprefix $(oa_targetdir)/algebra/, \
compress.daase interp.daase browse.daase categor.daase \
operation.daase libdb.text comb.text \
USERS.DAASE/index.KAF DEPENDENTS.DAASE/index.KAF)
openaxiom_glossfiles = \
- $(addprefix $(axiom_targetdir)/algebra/, \
+ $(addprefix $(oa_targetdir)/algebra/, \
glosskey.text gloss.ht glossdef.text)
subdir = src/etc/
@@ -63,9 +63,9 @@ all: all-ax
all-ax all-asq: stamp
@echo finished $(builddir)
-stamp: stamp-databases $(axiom_target_bindir)/asq$(EXEEXT) \
- $(axiom_target_libdir)/summary \
- $(axiom_target_libdir)/copyright
+stamp: stamp-databases $(oa_target_bindir)/asq$(EXEEXT) \
+ $(oa_target_libdir)/summary \
+ $(oa_target_libdir)/copyright
rm -f stamp
$(STAMP) stamp
@@ -76,24 +76,24 @@ stamp-databases: ../algebra/*.NRLIB/code.$(FASLEXT) ../doc/gloss.text
@ echo rebuilding databases...
rm -f stamp-databases
rm -f ../algebra/topics.data
- rm -f $(axiom_targetdir)/*.daase
- rm -f $(axiom_targetdir)/libdb.text
- rm -f $(axiom_targetdir)/comdb.text
- rm -rf $(axiom_targetdir)/algebra/USERS.DAASE
- rm -rf $(axiom_targetdir)/algebra/DEPENDENTS.DAASE
- cp $(axiom_src_docdir)/topics.data ../algebra
+ rm -f $(oa_targetdir)/*.daase
+ rm -f $(oa_targetdir)/libdb.text
+ rm -f $(oa_targetdir)/comdb.text
+ rm -rf $(oa_targetdir)/algebra/USERS.DAASE
+ rm -rf $(oa_targetdir)/algebra/DEPENDENTS.DAASE
+ cp $(oa_src_docdir)/topics.data ../algebra
(cd ../algebra && $(INTERPSYS) --build-databases)
- cp -p ../algebra/*.daase $(axiom_targetdir)/algebra
- cp -p ../algebra/libdb.text $(axiom_targetdir)/algebra
- cp -p ../algebra/comdb.text $(axiom_targetdir)/algebra
- mkdir -p $(axiom_targetdir)/algebra/USERS.DAASE
+ cp -p ../algebra/*.daase $(oa_targetdir)/algebra
+ cp -p ../algebra/libdb.text $(oa_targetdir)/algebra
+ cp -p ../algebra/comdb.text $(oa_targetdir)/algebra
+ mkdir -p $(oa_targetdir)/algebra/USERS.DAASE
cp -p ../algebra/USERS.DAASE/index.KAF \
- $(axiom_targetdir)/algebra/USERS.DAASE
- mkdir -p $(axiom_targetdir)/algebra/DEPENDENTS.DAASE
+ $(oa_targetdir)/algebra/USERS.DAASE
+ mkdir -p $(oa_targetdir)/algebra/DEPENDENTS.DAASE
cp -p ../algebra/DEPENDENTS.DAASE/index.KAF \
- $(axiom_targetdir)/algebra/DEPENDENTS.DAASE
- cp -p ../algebra/glosskey.text $(axiom_target_docdir)
- cp -p ../algebra/glossdef.text $(axiom_target_docdir)
+ $(oa_targetdir)/algebra/DEPENDENTS.DAASE
+ cp -p ../algebra/glosskey.text $(oa_target_docdir)
+ cp -p ../algebra/glossdef.text $(oa_target_docdir)
bin_PROGRAMS = asq$(EXEEXT)
asq_sources = asq.c
@@ -101,8 +101,8 @@ asq_SOURCES = $(addsuffix .pamphlet, $(asq_sources))
asq_objects = $(asq_sources:.c=.$(OBJEXT))
asq_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs)
-$(axiom_target_bindir)/asq$(EXEEXT): asq$(EXEEXT)
- cp -p $< $(axiom_target_bindir)
+$(oa_target_bindir)/asq$(EXEEXT): asq$(EXEEXT)
+ cp -p $< $(oa_target_bindir)
asq$(EXEEXT): $(asq_objects)
$(CXXLINK) -o $@ $(asq_objects) $(asq_LDADD)
@@ -114,13 +114,13 @@ asq$(EXEEXT): $(asq_objects)
asq.c: $(srcdir)/asq.c.pamphlet
$(oa_hammer) --tangle --output=$@ $<
-$(axiom_target_libdir)/summary: $(srcdir)/summary
+$(oa_target_libdir)/summary: $(srcdir)/summary
cp -p $< $@
-$(axiom_target_libdir)/copyright: $(srcdir)/copyright
+$(oa_target_libdir)/copyright: $(srcdir)/copyright
cp -p $< $@
-../doc/gloss.text: $(axiom_src_docdir)/gloss.text
+../doc/gloss.text: $(oa_src_docdir)/gloss.text
cp $< cp $@
mostlyclean-local:
@@ -130,8 +130,8 @@ mostlyclean-local:
rm -f stamp
clean-local: mostlyclean-local
- rm -f $(axiom_target_libdir)/summary
- rm -f $(axiom_target_libdir)/copyright
- rm -f $(axiom_target_bindir)/asq$(EXEEXT)
+ rm -f $(oa_target_libdir)/summary
+ rm -f $(oa_target_libdir)/copyright
+ rm -f $(oa_target_bindir)/asq$(EXEEXT)
distclean-local: clean-local
diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in
index 77a01a46..82a03c31 100644
--- a/src/graph/Gdraws/Makefile.in
+++ b/src/graph/Gdraws/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,28 +32,28 @@
-IN= $(axiom_src_srcdir)/graph/Gdraws
-OUT= $(axiom_target_libdir)
-PS= $(axiom_target_libdir)/graph
-DOC= $(axiom_target_docdir)/src/graph
+IN= $(oa_src_srcdir)/graph/Gdraws
+OUT= $(oa_target_libdir)
+PS= $(oa_target_libdir)/graph
+DOC= $(oa_target_docdir)/src/graph
# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
+LINC= $(oa_src_srcdir)/graph/include
# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
+GINC= $(oa_src_srcdir)/include
# include files in Hyperdoc
-HINC= $(axiom_src_srcdir)/hyper
+HINC= $(oa_src_srcdir)/hyper
# bitmaps for cursors
-BIT= $(axiom_src_srcdir)/graph/include/bitmaps
+BIT= $(oa_src_srcdir)/graph/include/bitmaps
# a .h file stuck in a really wierd place
-DOTH= $(axiom_src_srcdir)/graph/viewman
+DOTH= $(oa_src_srcdir)/graph/viewman
# a .c file in the library subdirectory
-DOTC= $(axiom_src_srcdir)/lib
+DOTC= $(oa_src_srcdir)/lib
AXIOM_CFLAGS = ${CXXFLAGS)} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \
$(axiom_includes) ${AXIOM_X11_CFLAGS}
@@ -79,7 +79,7 @@ PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps ${PS}/draw.ps \
.PHONY: all all-ax all-Gdraws
all: all-ax
all-ax all-Gdraws: stamp
- @ echo finished making $(axiom_src_srcdir)/Gdraws
+ @ echo finished making $(oa_src_srcdir)/Gdraws
.PHONY: PSfiles.post
stamp: Gfun.$(OBJEXT) $(PSfiles)
@@ -87,7 +87,7 @@ stamp: Gfun.$(OBJEXT) $(PSfiles)
$(STAMP) stamp
$(PS)/%.ps: $(srcdir)/psFiles.pamphlet
- $(axiom_build_document) --tangle=$* --output=$@ $<
+ $(oa_build_document) --tangle=$* --output=$@ $<
Gfun.$(OBJEXT): ${HEADERS}
diff --git a/src/graph/Makefile.in b/src/graph/Makefile.in
index 4368c446..e816625d 100644
--- a/src/graph/Makefile.in
+++ b/src/graph/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ all-subdirs: all-subdirs.pre all-subdirs.rest
.PHONY: all-PS
all-PS: all-Gdraws $(srcdir)/PS/*.ps
- cp -p $(srcdir)/PS/*.ps $(axiom_target_libdir)/graph/
+ cp -p $(srcdir)/PS/*.ps $(oa_target_libdir)/graph/
.PHONY: all-subdirs.pre
all-subdirs.pre:
@@ -67,7 +67,7 @@ all-subdirs.rest: all-subdirs.pre all-Gdraws all-viewman \
all-viewman: all-Gdraws
cd viewman && ${MAKE}
all-Gdraws:
- @$(mkdir_p) $(axiom_target_libdir)/graph
+ @$(mkdir_p) $(oa_target_libdir)/graph
cd Gdraws && ${MAKE}
all-view3D: all-Gdraws
cd view3D && ${MAKE}
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index c645ceec..51d27af1 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,10 @@
# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
+LINC= $(oa_src_srcdir)/graph/include
# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
+GINC= $(oa_src_srcdir)/include
build_libdir = $(top_builddir)/src/lib
@@ -69,11 +69,11 @@ all: all-ax
all-ax all-view2D: stamp
@ echo finished $(builddir)
-stamp: $(axiom_target_libdir)/view2D$(EXEEXT)
+stamp: $(oa_target_libdir)/view2D$(EXEEXT)
@rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
+$(oa_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
$(CXXLINK) -o $@ $(view2D_objects) $(Gfun_objects) \
$(view2D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
@@ -88,6 +88,6 @@ mostlyclean-local:
clean-local: mostlyclean-local
@rm -f $(view2D_objects)
- @rm -f $(axiom_target_libdir)/view2D$(EXEEXT)
+ @rm -f $(oa_target_libdir)/view2D$(EXEEXT)
distclean-local: clean-local
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 9111bee7..73a499a6 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -30,16 +30,16 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-IN= $(axiom_src_srcdir)/graph/view3D
+IN= $(oa_src_srcdir)/graph/view3D
# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
+LINC= $(oa_src_srcdir)/graph/include
# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
+GINC= $(oa_src_srcdir)/include
# bitmaps for cursors
-BIT= $(axiom_src_srcdir)/graph/include/purty
+BIT= $(oa_src_srcdir)/graph/include/purty
build_libdir = $(top_builddir)/src/lib
@@ -75,11 +75,11 @@ all: all-ax
all-ax all-view3D: stamp
@echo finished $(srcdir)
-stamp: $(axiom_target_libdir)/view3D$(EXEEXT)
+stamp: $(oa_target_libdir)/view3D$(EXEEXT)
@rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
+$(oa_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
$(CXXLINK) -o $@ $(view3D_objects) $(Gfun_objects) \
$(view3D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index bc4611f5..fae61ed0 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,10 @@
# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
+LINC= $(oa_src_srcdir)/graph/include
# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
+GINC= $(oa_src_srcdir)/include
build_libdir = $(top_builddir)/src/lib
@@ -62,11 +62,11 @@ all: all-ax
all-ax all-viewAlone: stamp
@echo finished $(builddir)
-stamp: $(axiom_target_bindir)/viewAlone$(EXEEXT)
+stamp: $(oa_target_bindir)/viewAlone$(EXEEXT)
@rm -f stamp
$(STAMP) stamp
-$(axiom_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
+$(oa_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
$(viewAlone_DEPENDENCIES)
$(CXXLINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD)
@@ -81,7 +81,7 @@ mostlyclean-local:
clean-local: mostlyclean-local
@rm -f $(viewAlone_objects)
- @rm -f $(axiom_target_bindir)/viewAlone$(EXEEXT)
+ @rm -f $(oa_target_bindir)/viewAlone$(EXEEXT)
distclean-local: clean-local
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index f1b4ac21..560d86b0 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,10 @@
# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
+LINC= $(oa_src_srcdir)/graph/include
# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
+GINC= $(oa_src_srcdir)/include
build_libdir = $(top_builddir)/src/lib
@@ -46,10 +46,10 @@ viewman_SOURCES = cleanup.c fun2D.c fun3D.c make2D.c make3D.c \
viewman_objects = $(viewman_SOURCES:.c=.lo)
viewman_headers = $(srcdir)/viewman.h \
- $(addprefix $(axiom_src_srcdir)/graph/include/,\
+ $(addprefix $(oa_src_srcdir)/graph/include/,\
component.h view2D.h view3D.h tube.h \
actions.h viewCommand.h) \
- $(axiom_src_srcdir)/include/com.h
+ $(oa_src_srcdir)/include/com.h
viewman_DEPENDENCIES =
@@ -66,7 +66,7 @@ all: all-ax
all-ax all-viewman: stamp
@ echo 30 finished $(srcdir)
-stamp: $(axiom_target_libdir)/viewman$(EXEEXT)
+stamp: $(oa_target_libdir)/viewman$(EXEEXT)
@rm -f stamp
$(STAMP) stamp
@@ -78,14 +78,14 @@ stamp: $(axiom_target_libdir)/viewman$(EXEEXT)
%.lo: %.c $(axiom_c_macros_h)
$(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-$(axiom_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
+$(oa_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
$(CXXLINK) -o $@ $(viewman_objects) $(viewman_LDADD)
mostlyclean-local:
clean-local: mostlyclean-local
@rm -f $(viewman_objects)
- @rm -f $(axiom_target_libdir)/viewman$(EXEEXT)
+ @rm -f $(oa_target_libdir)/viewman$(EXEEXT)
distclean-local: clean-local
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index ec94c6be..c53ed2f0 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -40,13 +40,13 @@ bin_PROGRAMS += hypertex$(EXEEXT) spadbuf$(EXEEXT)
endif
# this is where to put the various commands
-OUTLIB = $(axiom_target_libdir)
+OUTLIB = $(oa_target_libdir)
# this is where the include files live
-INC = $(axiom_src_srcdir)/include
+INC = $(oa_src_srcdir)/include
# this is where the hypertex documentation files are
-HYPER=$(axiom_target_datadir)/hypertex
+HYPER=$(oa_target_datadir)/hypertex
HTADD = $(OUTLIB)/htadd
@@ -147,7 +147,7 @@ distclean-local: clean-local
$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $<
${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
- @echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory
+ @echo making ${HYPER}/pages from $(oa_src_srcdir)/pages directory
@ mkdir -p "${HYPER}"/pages
@ cp "$(srcdir)"/pages/*.ht "$(HYPER)"/pages/
@ for A in `ls "$(srcdir)"/pages/*.pht`; do \
@@ -162,7 +162,7 @@ ${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
@ mkdir -p "$(HYPER)"/bitmaps
@ for f in `ls "$(srcdir)"/bitmaps/*.bitmap "$(srcdir)"/bitmaps/*.xbm`; do\
cp -p $$f "$(HYPER)"/bitmaps; done
- @ # cp -pr "$(srcdir)"/viewports "$(axiom_target_datadir)"
+ @ # cp -pr "$(srcdir)"/viewports "$(oa_target_datadir)"
${OUTLIB}/htsearch$(EXEEXT): $(htsearch_objects) $(htsearch_DEPENDENCIES)
${CXXLINK} -o $@ $(htsearch_objects) $(htsearch_LDADD)
diff --git a/src/include/FileMapping.H b/src/include/FileMapping.H
index 0ab943fd..0c836efb 100644
--- a/src/include/FileMapping.H
+++ b/src/include/FileMapping.H
@@ -1,4 +1,5 @@
-// Copyright (C) 2010-2013, Gabriel Dos Reis.
+// -*- C++ -*-
+// Copyright (C) 2010-2014, Gabriel Dos Reis.
// All rights reserved.
// Written by Gabriel Dos Reis.
//
diff --git a/src/input/Makefile.in b/src/input/Makefile.in
index 684c5931..aa7ebcf0 100644
--- a/src/input/Makefile.in
+++ b/src/input/Makefile.in
@@ -1,6 +1,6 @@
## Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
## All rights reserved.
-## Copyright (C) 2007-2010, Gabriel Dos Reis.
+## Copyright (C) 2007-2014, Gabriel Dos Reis.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -35,10 +35,10 @@
subdir = src/input/
-IN=$(axiom_src_srcdir)/input
+IN=$(oa_src_srcdir)/input
MID=./$(top_builddir)/int/input
-OUT=$(axiom_targetdir)/input
-DOC=$(axiom_target_docdir)/src/input
+OUT=$(oa_targetdir)/input
+DOC=$(oa_target_docdir)/src/input
NAGLIB=${OUT}/c02aff.input ${OUT}/c02agf.input ${OUT}/c05adf.input \
${OUT}/c05nbf.input ${OUT}/c05pbf.input ${OUT}/c06eaf.input \
@@ -572,9 +572,9 @@ distclean-local: clean-local
DRIVER = ../driver/open-axiom$(EXEEXT)
TESTSYS= \
- $(DRIVER) --execpath=$(axiom_target_bindir)/AXIOMsys$(EXEEXT) \
+ $(DRIVER) --execpath=$(oa_target_bindir)/AXIOMsys$(EXEEXT) \
--system="$(AXIOM)" \
- --sysalg="$(axiom_targetdir)/algebra/" \
+ --sysalg="$(oa_targetdir)/algebra/" \
--test
SKIP= antoine.output as-eg1.output as-eg2.output \
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 2ee08066..4267da98 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -1,6 +1,6 @@
## Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
## All rights reserved.
-## Copyright (C) 2007-2013, Gabriel Dos Reis.
+## Copyright (C) 2007-2014, Gabriel Dos Reis.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -36,11 +36,11 @@
subdir = src/interp/
IN=$(srcdir)
-DOC=$(axiom_target_docdir)/src/interp
-BOOK=$(axiom_target_docdir)
+DOC=$(oa_target_docdir)/src/interp
+BOOK=$(oa_target_docdir)
## Where to put interp modules
-oa_target_moddir = $(axiom_targetdir)/interp
+oa_target_moddir = $(oa_targetdir)/interp
## FFI module.
OA_FFI_MOD = sys-os.$(FASLEXT)
@@ -54,13 +54,13 @@ oa_target_delayed = $(oa_target_moddir)/$(OA_FFI_MOD)
DRIVER = $(top_builddir)/src/driver/open-axiom$(EXEEXT)
# Translator from Boot to Lisp (or machine code)
-BOOTSYS = $(axiom_target_bindir)/bootsys$(EXEEXT)
+BOOTSYS = $(oa_target_bindir)/bootsys$(EXEEXT)
# Minimal OpenAxiom image necessary to build the algebra
SAVESYS= interpsys$(EXEEXT)
# Complete OpenAxiom image after completion of algebra, ready to install.
-AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT)
+AXIOMSYS= $(oa_target_bindir)/AXIOMsys$(EXEEXT)
OBJS= boot-pkg.$(FASLEXT) types.$(FASLEXT) \
$(OA_FFI_OBJ) \
@@ -137,7 +137,7 @@ BROBJS= bc-matrix.$(FASLEXT) \
topics.$(FASLEXT) br-prof.$(FASLEXT) \
br-saturn.$(FASLEXT)
-TIMESTAMP=$(axiom_targetdir)/timestamp
+TIMESTAMP=$(oa_targetdir)/timestamp
YEARWEEK=(progn (defconstant timestamp "${TIMESTAMP}") \
(setq *build-version* "$(PACKAGE_STRING)") \
(yearweek))
@@ -181,9 +181,9 @@ $(oa_target_delayed): $(OA_FFI_MOD)
$(mkdir_p) $(oa_target_moddir)
cp -p $< $@
-$(axiom_target_datadir)/msgs/s2-us.msgs: \
- $(axiom_src_docdir)/msgs/s2-us.msgs
- $(mkdir_p) $(axiom_target_datadir)/msgs
+$(oa_target_datadir)/msgs/s2-us.msgs: \
+ $(oa_src_docdir)/msgs/s2-us.msgs
+ $(mkdir_p) $(oa_target_datadir)/msgs
cp -p $< $@
makeint.lisp: Makefile
@@ -197,35 +197,35 @@ makeint.lisp: Makefile
@ echo '#+:gcl (si::gbc-time 0)' >> makeint.lisp
@ echo '#+:GCL (si::gbc t)' >> makeint.lisp
-$(SAVESYS): database.date $(axiom_target_datadir)/msgs/s2-us.msgs $(OBJS) $(oa_target_ffi)
+$(SAVESYS): database.date $(oa_target_datadir)/msgs/s2-us.msgs $(OBJS) $(oa_target_ffi)
$(DRIVER) --execpath=$(BOOTSYS) \
- --syslib=$(axiom_target_libdir) --system="$(AXIOM)/" \
+ --syslib=$(oa_target_libdir) --system="$(AXIOM)/" \
--prologue="(pushnew :open-axiom-basic-system *features*)" \
--make --output=$@ --main="BOOT::|systemMain|" \
--load-directory=. $(OBJS)
- $(mkdir_p) $(axiom_target_bindir)
+ $(mkdir_p) $(oa_target_bindir)
.PHONY: all-axiomsys
all-axiomsys: ${AXIOMSYS}
${AXIOMSYS}: database.date \
- $(axiom_targetdir)/algebra/exposed.$(FASLEXT) \
- $(axiom_target_datadir)/msgs/s2-us.msgs \
+ $(oa_targetdir)/algebra/exposed.$(FASLEXT) \
+ $(oa_target_datadir)/msgs/s2-us.msgs \
$(OBJS) $(oa_target_ffi) makeint.$(LNKEXT)
$(DRIVER) --execpath=$(BOOTSYS) \
- --syslib=$(axiom_target_libdir) \
+ --syslib=$(oa_target_libdir) \
--system="$(AXIOM)/" \
- --sysalg="$(axiom_targetdir)/algebra/" \
+ --sysalg="$(oa_targetdir)/algebra/" \
--prologue="(pushnew :open-axiom-algebra-system *features*)" \
--make --output=$@ --main="BOOT::|systemMain|" \
--load-directory=. $(OBJS) makeint.$(LNKEXT)
@ echo 6a $@ created
-exposed.lsp: $(axiom_src_algdir)/exposed.lsp.pamphlet
+exposed.lsp: $(oa_src_algdir)/exposed.lsp.pamphlet
$(oa_hammer) --tangle --output=$@ $<
-$(axiom_targetdir)/algebra/exposed.$(FASLEXT) : exposed.lsp boot-pkg.$(LNKEXT)
- $(mkdir_p) $(axiom_targetdir)/algebra
- $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(axiom_target_libdir) \
+$(oa_targetdir)/algebra/exposed.$(FASLEXT) : exposed.lsp boot-pkg.$(LNKEXT)
+ $(mkdir_p) $(oa_targetdir)/algebra
+ $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(oa_target_libdir) \
--compile --output=$@ --load-directory=. $<
database.date:
@@ -234,11 +234,11 @@ database.date:
%.$(LNKEXT) %.$(FASLEXT): %.boot
- $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(axiom_target_libdir) \
+ $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(oa_target_libdir) \
--compile --output=$@ --load-directory=. $<
%.$(LNKEXT) %.$(FASLEXT): %.lisp
- $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(axiom_target_libdir) \
+ $(DRIVER) --execpath=$(BOOTSYS) --syslib=$(oa_target_libdir) \
--compile --output=$@ --load-directory=. $<
## Translation to Fortran
@@ -388,6 +388,6 @@ io.$(FASLEXT): sys-constants.$(FASLEXT)
types.$(FASLEXT): boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
-$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
+$(oa_build_texdir)/diagrams.tex: $(oa_src_docdir)/diagrams.tex
@cp -p $< $@
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 25b8be68..0070906c 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -58,9 +58,9 @@ libopen_axiom_core_objects = $(libopen_axiom_core_SOURCES:.c=.lo)
endif
libspad_objects = $(libspad_SOURCES:.c=.lo)
-oa_installed_corelib = $(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT)
+oa_installed_corelib = $(oa_target_libdir)/libopen-axiom-core.$(LIBEXT)
ifeq (@oa_use_dynamic_lib@,yes)
-oa_installed_corelib += $(axiom_target_libdir)/libopen-axiom-core$(SHREXT)
+oa_installed_corelib += $(oa_target_libdir)/libopen-axiom-core$(SHREXT)
endif
subdir = src/lib/
@@ -76,16 +76,16 @@ stamp: $(oa_installed_corelib) libspad.$(LIBEXT)
rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT): \
+$(oa_target_libdir)/libopen-axiom-core.$(LIBEXT): \
libopen-axiom-core.$(LIBEXT)
- $(mkdir_p) $(axiom_target_libdir)
+ $(mkdir_p) $(oa_target_libdir)
cp -p $< $@
# Don't put the shared lib here -- place it directly in its final home;
# we don't want to pick it accidently.
-$(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
+$(oa_target_libdir)/libopen-axiom-core$(SHREXT): \
$(libopen_axiom_core_objects)
- $(mkdir_p) $(axiom_target_libdir)
+ $(mkdir_p) $(oa_target_libdir)
$(CXXLINK_SHRLIB) $(oa_shrlib_flags) -o $@ \
$(libopen_axiom_core_objects) \
@oa_c_runtime_extra@ -lm
@@ -109,7 +109,7 @@ mostlyclean-local:
@rm -f *.$(OBJEXT) *.lo
clean-local: mostlyclean-local
- @rm -f $(axiom_target_libdir)/libopen-axiom-core$(SHREXT)
+ @rm -f $(oa_target_libdir)/libopen-axiom-core$(SHREXT)
@rm -f libopen-axiom-core.$(LIBEXT)
@rm -f libspad.$(LIBEXT)
@rm -fr .libs _libs
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 6bfc0ee4..7c23016c 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-OUT = $(axiom_build_bindir)
-oa_target_lispdir = $(axiom_targetdir)/lisp
+OUT = $(oa_build_bindir)
+oa_target_lispdir = $(oa_targetdir)/lisp
subdir = src/lisp/
diff --git a/src/share/Makefile.in b/src/share/Makefile.in
index f4813bad..5a22cf5e 100644
--- a/src/share/Makefile.in
+++ b/src/share/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
subdir = src/share/
FILES = \
- $(axiom_target_libdir)/command.list \
- $(axiom_target_texdir)/open-axiom.sty
+ $(oa_target_libdir)/command.list \
+ $(oa_target_texdir)/open-axiom.sty
.SUFFIXES:
@@ -55,10 +55,10 @@ mostlyclean-local:
clean-local: mostlyclean-local
distclean-local: clean-local
-$(axiom_target_libdir)/command.list: $(srcdir)/algebra/command.list
+$(oa_target_libdir)/command.list: $(srcdir)/algebra/command.list
cp -p $< $@
-$(axiom_target_texdir)/open-axiom.sty: $(axiom_src_texdir)/open-axiom.sty
- $(mkdir_p) "$(axiom_target_texdir)"
+$(oa_target_texdir)/open-axiom.sty: $(oa_src_texdir)/open-axiom.sty
+ $(mkdir_p) "$(oa_target_texdir)"
cp -p $< $@
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in
index 86a01cba..71ac4ae3 100644
--- a/src/sman/Makefile.in
+++ b/src/sman/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -33,11 +33,11 @@
subdir = src/sman/
# this is where to put the various commands
-OUT= $(axiom_target_bindir)
-OUTLIB= $(axiom_target_libdir)
+OUT= $(oa_target_bindir)
+OUTLIB= $(oa_target_libdir)
# this is where the include files live
-INC= $(axiom_src_srcdir)/include
+INC= $(oa_src_srcdir)/include
build_libdir = $(top_builddir)/src/lib
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 354d0933..b0a0e504 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013, Gabriel Dos Reis.
+# Copyright (C) 2011-2014, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ oa_include_flags = -I. -I$(oa_target_includedir) \
-I$(top_srcdir)/src/include \
-DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\""
-oa_target_oalib = $(axiom_target_libdir)/libOpenAxiom.$(LIBEXT)
+oa_target_oalib = $(oa_target_libdir)/libOpenAxiom.$(LIBEXT)
.PHONY: all all-ax all-utils
.SUFFIXES:
@@ -70,8 +70,8 @@ stamp: $(oa_target_oalib) $(bin_PROGRAMS)
$(STAMP) stamp
$(oa_target_oalib): libOpenAxiom.$(LIBEXT)
- if [ ! -d $(axiom_target_libdir) ]; then \
- mkdir -p $(axiom_target_libdir); \
+ if [ ! -d $(oa_target_libdir) ]; then \
+ mkdir -p $(oa_target_libdir); \
fi
cp $< $@
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 05:57:30 +0000