diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 14 | ||||
| -rw-r--r-- | src/algebra/Makefile.am | 2 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 16 | ||||
| -rw-r--r-- | src/boot/Makefile.in | 2 | ||||
| -rw-r--r-- | src/hyper/Makefile.in | 6 | ||||
| -rw-r--r-- | src/io/Makefile.in | 14 | ||||
| -rw-r--r-- | src/lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | src/rt/Makefile.in | 14 | ||||
| -rw-r--r-- | src/syntax/Makefile.in | 14 |
9 files changed, 44 insertions, 44 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 7890895f..aef3e9df 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -305,12 +305,6 @@ 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@ @@ -345,21 +339,27 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ +oa_cflags = @oa_cflags@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_threads = @oa_enable_threads@ +oa_eval_flags = @oa_eval_flags@ +oa_fasl_type = @oa_fasl_type@ +oa_host_has_regex = @oa_host_has_regex@ oa_keep_files = @oa_keep_files@ +oa_lisp_flavor = @oa_lisp_flavor@ oa_optimize_options = @oa_optimize_options@ +oa_quiet_flags = @oa_quiet_flags@ 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@ +oa_use_x = @oa_use_x@ oldincludedir = @oldincludedir@ open_axiom_installdir = @open_axiom_installdir@ -openaxiom_host_has_regex = @openaxiom_host_has_regex@ pdfdir = @pdfdir@ pointer_type = @pointer_type@ prefix = @prefix@ diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index d994e5c6..7cbdb34b 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -97,7 +97,7 @@ INPUT=../input STAMP = echo timestamp > # Extension of the output file name returned by compile-file -FASLEXT = @axiom_fasl_type@ +FASLEXT = @oa_fasl_type@ oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT) diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index ea649ae8..5cff1dbd 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -490,12 +490,6 @@ 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@ @@ -530,21 +524,27 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ +oa_cflags = @oa_cflags@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_threads = @oa_enable_threads@ +oa_eval_flags = @oa_eval_flags@ +oa_fasl_type = @oa_fasl_type@ +oa_host_has_regex = @oa_host_has_regex@ oa_keep_files = @oa_keep_files@ +oa_lisp_flavor = @oa_lisp_flavor@ oa_optimize_options = @oa_optimize_options@ +oa_quiet_flags = @oa_quiet_flags@ 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@ +oa_use_x = @oa_use_x@ oldincludedir = @oldincludedir@ open_axiom_installdir = @open_axiom_installdir@ -openaxiom_host_has_regex = @openaxiom_host_has_regex@ pdfdir = @pdfdir@ pointer_type = @pointer_type@ prefix = @prefix@ @@ -586,7 +586,7 @@ INPUT = ../input STAMP = echo timestamp > # Extension of the output file name returned by compile-file -FASLEXT = @axiom_fasl_type@ +FASLEXT = @oa_fasl_type@ oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT) # Name of the driver to launch the compiler diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in index 8900e7ff..b1634221 100644 --- a/src/boot/Makefile.in +++ b/src/boot/Makefile.in @@ -58,7 +58,7 @@ boot_clisp = $(boot_SOURCES:.boot=.clisp) boot_objects = $(boot_SOURCES:.boot=.$(LNKEXT)) oa_target_bootdir = $(oa_targetdir)/boot -ifeq (@axiom_lisp_flavor@,ecl) +ifeq (@oa_lisp_flavor@,ecl) oa_boot_linkset = $(oa_target_bootdir)/linkset else oa_boot_linkset = diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index c53ed2f0..ea9d1971 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -29,13 +29,13 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -openaxiom_host_has_regex = @openaxiom_host_has_regex@ +oa_host_has_regex = @oa_host_has_regex@ bin_PROGRAMS = htadd$(EXEEXT) ex2ht$(EXEEXT) -ifeq ($(strip $(openaxiom_host_has_regex)),yes) +ifeq ($(strip $(oa_host_has_regex)),yes) bin_PROGRAMS += hthits$(EXEEXT) htsearch$(EXEEXT) endif -ifeq ($(strip $(axiom_use_x)),yes) +ifeq ($(strip $(oa_use_x)),yes) bin_PROGRAMS += hypertex$(EXEEXT) spadbuf$(EXEEXT) endif diff --git a/src/io/Makefile.in b/src/io/Makefile.in index 2d530552..86e59519 100644 --- a/src/io/Makefile.in +++ b/src/io/Makefile.in @@ -302,12 +302,6 @@ 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@ @@ -342,21 +336,27 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ +oa_cflags = @oa_cflags@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_threads = @oa_enable_threads@ +oa_eval_flags = @oa_eval_flags@ +oa_fasl_type = @oa_fasl_type@ +oa_host_has_regex = @oa_host_has_regex@ oa_keep_files = @oa_keep_files@ +oa_lisp_flavor = @oa_lisp_flavor@ oa_optimize_options = @oa_optimize_options@ +oa_quiet_flags = @oa_quiet_flags@ 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@ +oa_use_x = @oa_use_x@ oldincludedir = @oldincludedir@ open_axiom_installdir = @open_axiom_installdir@ -openaxiom_host_has_regex = @openaxiom_host_has_regex@ pdfdir = @pdfdir@ pointer_type = @pointer_type@ prefix = @prefix@ diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index 7c23016c..1cba7ca2 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -57,7 +57,7 @@ fasl_ext = $(if $(findstring mingw, $(target)),.lisp,.$(FASLEXT)) FASLS = $(patsubst %,"%", $(addsuffix $(fasl_ext),core)) -ifeq (@axiom_lisp_flavor@,ecl) +ifeq (@oa_lisp_flavor@,ecl) base_lisp_objects = ("core.$(LNKEXT)") oa_base_lisp_linkset = $(oa_target_lispdir)/linkset else @@ -95,7 +95,7 @@ lisp_c_objects = \ ## therefore forcing us to use brittle tricks to guess what the linker is. $(OUT)/lisp$(EXEEXT): base-lisp$(EXEEXT) -ifeq (@axiom_lisp_flavor@,gcl) +ifeq (@oa_lisp_flavor@,gcl) echo '(let* ((sys-cc compiler::*cc*) ' \ ' (sys-ld compiler::*ld*) ' \ ' (compiler::*cc* (concatenate (quote string) ' \ @@ -176,7 +176,7 @@ core.lisp: $(srcdir)/core.lisp.in $(top_srcdir)/config/move-if-change $@.tmp $@ core.$(FASLEXT): core.lisp -ifeq (@axiom_lisp_flavor@,ecl) +ifeq (@oa_lisp_flavor@,ecl) $(AXIOM_LISP) $(quiet_flags) \ $(eval_flags) '(require (quote cmp))' \ $(eval_flags) '(compile-file "$<" :system-p t)' \ diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in index 3444a079..30730d5e 100644 --- a/src/rt/Makefile.in +++ b/src/rt/Makefile.in @@ -302,12 +302,6 @@ 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@ @@ -342,21 +336,27 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ +oa_cflags = @oa_cflags@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_threads = @oa_enable_threads@ +oa_eval_flags = @oa_eval_flags@ +oa_fasl_type = @oa_fasl_type@ +oa_host_has_regex = @oa_host_has_regex@ oa_keep_files = @oa_keep_files@ +oa_lisp_flavor = @oa_lisp_flavor@ oa_optimize_options = @oa_optimize_options@ +oa_quiet_flags = @oa_quiet_flags@ 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@ +oa_use_x = @oa_use_x@ oldincludedir = @oldincludedir@ open_axiom_installdir = @open_axiom_installdir@ -openaxiom_host_has_regex = @openaxiom_host_has_regex@ pdfdir = @pdfdir@ pointer_type = @pointer_type@ prefix = @prefix@ diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in index 4476a92d..601fefed 100644 --- a/src/syntax/Makefile.in +++ b/src/syntax/Makefile.in @@ -302,12 +302,6 @@ 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@ @@ -342,21 +336,27 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ +oa_cflags = @oa_cflags@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_threads = @oa_enable_threads@ +oa_eval_flags = @oa_eval_flags@ +oa_fasl_type = @oa_fasl_type@ +oa_host_has_regex = @oa_host_has_regex@ oa_keep_files = @oa_keep_files@ +oa_lisp_flavor = @oa_lisp_flavor@ oa_optimize_options = @oa_optimize_options@ +oa_quiet_flags = @oa_quiet_flags@ 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@ +oa_use_x = @oa_use_x@ oldincludedir = @oldincludedir@ open_axiom_installdir = @open_axiom_installdir@ -openaxiom_host_has_regex = @openaxiom_host_has_regex@ pdfdir = @pdfdir@ pointer_type = @pointer_type@ prefix = @prefix@ |