summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1997-03-21 13:40:47 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1997-03-21 13:40:47 +0000
commit08ddad343ecbb0ca5f7274fe6c56f7010ac280f9 (patch)
tree856fe1ed35807168a048ec821572a1b0596406ba
parente7b36124b549d238261444941367453b03f1e0e5 (diff)
MAJ 1.05
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1433 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--LICENSE2
-rw-r--r--Makefile.nt2
-rw-r--r--otherlibs/systhreads/Makefile.nt2
-rw-r--r--stdlib/Makefile.nt2
4 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 63a3c3f86..3338dfead 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
LEGAL NOTICE
-Software: Objective Caml, version 1.03 of October 1996,
+Software: Objective Caml, version 1.05 of March 1997,
hereinafter referred to as "the software".
The software has been designed and produced by Xavier Leroy and Damien
diff --git a/Makefile.nt b/Makefile.nt
index ba6b2a1d8..31e94a6b1 100644
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -235,7 +235,7 @@ utils\config.ml: utils\config.mlp config\Makefile.nt
sed -e "s|%%%%LIBDIR%%%%|$(LIBDIR:\=/)|" \
-e "s|%%%%BYTECC%%%%|$(BYTECC) $(BYTECCLINKOPTS)|" \
-e "s|%%%%NATIVECC%%%%|$(NATIVECC) $(NATIVECCLINKOPTS)|" \
- -e "s|%%PARTIALLD%%|lib /nologo /debugtype:cv|' \
+ -e "s|%%PARTIALLD%%|lib /nologo /debugtype:cv|" \
-e "s|%%%%CCLIBS%%%%|$(CCLIBS)|" \
-e "s|%%%%ARCH%%%%|$(ARCH)|" \
-e "s|%%%%MODEL%%%%|$(MODEL)|" \
diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt
index 5c1be35d7..eb0c1bd55 100644
--- a/otherlibs/systhreads/Makefile.nt
+++ b/otherlibs/systhreads/Makefile.nt
@@ -16,7 +16,7 @@ LIB_OBJS=mutex.cmo iolock.cmo pervasives.cmo \
$(LIB)\set.cmo $(LIB)\map.cmo $(LIB)\stack.cmo $(LIB)\queue.cmo \
$(LIB)\stream.cmo $(LIB)\printf.cmo $(LIB)\format.cmo $(LIB)\arg.cmo \
$(LIB)\printexc.cmo $(LIB)\gc.cmo $(LIB)\digest.cmo $(LIB)\random.cmo \
- $(LIB)\oo.cmo $(LIB)\genlex.cmo $(LIB)\callback.cmo
+ $(LIB)\oo.cmo $(LIB)\genlex.cmo $(LIB)\callback.cmo $(LIB)\weak.cmo
THREAD_OBJS=thread.cmo condition.cmo event.cmo threadUnix.cmo
diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt
index ece8b4620..9f0ba9b99 100644
--- a/stdlib/Makefile.nt
+++ b/stdlib/Makefile.nt
@@ -11,7 +11,7 @@ OBJS=pervasives.cmo list.cmo char.cmo string.cmo array.cmo sys.cmo \
hashtbl.cmo sort.cmo filename.cmo obj.cmo lexing.cmo parsing.cmo \
set.cmo map.cmo stack.cmo queue.cmo stream.cmo \
printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo \
- digest.cmo random.cmo oo.cmo genlex.cmo callback.cmo
+ digest.cmo random.cmo oo.cmo genlex.cmo callback.cmo weak.cmo
all: stdlib.cma std_exit.cmo camlheader