aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-07 22:27:42 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-07 22:27:42 +0000
commit0b7e16bb78d7715409c44bf6b41f9fb234b8f987 (patch)
tree5213ebcd45ff338825d2d41bb3cea47e44d0e3bb /src/lib
parentb026c698fddcfeba5d125e09583555f6fbffd5e9 (diff)
downloadopen-axiom-0b7e16bb78d7715409c44bf6b41f9fb234b8f987.tar.gz
* lisp/core.lisp.in (boot-completed-p): New.
(|$useDynamicLink|): Likewise. (|$effectiveFaslType|): Hold extension of linkable FASL. (|$NativeModuleExt|): Tidy. (|$CoreLibName|): New. (|$ExtraRuntimeLibraries|): Likewise. (extra-runtime-libs): Likewise. (complete-fasl-list-for-link): Likewise. (|link|) [ECL]: Link against system libraries. (|compileLispFile|): Tidy. (begin-compile-time): New. (end-compile-time): Likewise. (compile-time-p): Likewise. (import-module): Use it. * lisp/Makefile.in ($(OUT)/lisp$(EXEEXT)): Use oa_c_runtime_extra. * lib/Makefile.in (oa_installed_corelib): New. * boot/initial-env.lisp: Don't export systemRootDirectory and systemLibraryDirectory from here. * boot/translator.boot (systemRootDirectory): Move to lisp/core.lisp. (systemLibraryDirectory): Likewise. (loadSystemRuntimeCore): Do nothing for GCL and ECL. * interp/boot-pkg.lisp: Inform that Boot system is compleye.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 3899031e..3dde3af7 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -58,6 +58,11 @@ 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)
+ifeq (@oa_use_dynamic_lib@,yes)
+oa_installed_corelib += $(axiom_target_libdir)/libopen-axiom-core$(SHREXT)
+endif
+
subdir = src/lib/
.PHONY: all all-lib
@@ -67,14 +72,15 @@ subdir = src/lib/
all: all-ax
all-ax all-lib: stamp
-stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \
- libopen-axiom-core.$(LIBEXT) libspad.$(LIBEXT)
+stamp: $(oa_installed_corelib) libspad.$(LIBEXT)
rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
- $(libopen_axiom_core_objects)
+$(axiom_target_libdir)/libopen-axiom-core.%: libopen-axiom-core.%
$(mkdir_p) $(axiom_target_libdir)
+ cp -p $< $@
+
+libopen-axiom-core$(SHREXT): $(libopen_axiom_core_objects)
$(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \
$(libopen_axiom_core_objects) \
@axiom_c_runtime_extra@ -lm