summaryrefslogtreecommitdiffstats
path: root/otherlibs/str
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1996-04-30 14:53:58 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1996-04-30 14:53:58 +0000
commit2301d778e79a859efe0dc02bd6a676120f1b83a6 (patch)
tree0d8b7afdcc1fe3523a57ffb7a569eb1a9db6991f /otherlibs/str
parent1cbdeef09bbc3ab0a312b3c0438f588392ec2aa2 (diff)
Renommage en Objective Caml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@782 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/str')
-rw-r--r--otherlibs/str/Makefile8
-rw-r--r--otherlibs/str/Makefile.nt8
-rw-r--r--otherlibs/str/str.ml4
-rw-r--r--otherlibs/str/str.mli4
4 files changed, 12 insertions, 12 deletions
diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile
index 55b1fa406..65ebf97c4 100644
--- a/otherlibs/str/Makefile
+++ b/otherlibs/str/Makefile
@@ -5,8 +5,8 @@ include ../../config/Makefile
# Compilation options
CC=$(BYTECC)
CFLAGS=-O -I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS)
-CAMLC=../../boot/cslrun ../../boot/cslc -I ../../boot
-CAMLOPT=../../boot/cslrun ../../cslopt -I ../../stdlib
+CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../boot
+CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
REGEXLIB=regex-0.12
COBJS=strstubs.o $(REGEXLIB)/regex.o
@@ -28,7 +28,7 @@ str.cmxa: str.cmx
$(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h
cd $(REGEXLIB); CC="$(CC)" sh configure; $(MAKE)
-str.cmx: ../../cslopt
+str.cmx: ../../ocamlopt
clean:
rm -f *.cm*
@@ -59,6 +59,6 @@ installopt:
depend:
gcc -MM $(CFLAGS) *.c > .depend
- ../../tools/csldep *.mli *.ml >> .depend
+ ../../tools/ocamldep *.mli *.ml >> .depend
include .depend
diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt
index ba7d951e2..77f90f086 100644
--- a/otherlibs/str/Makefile.nt
+++ b/otherlibs/str/Makefile.nt
@@ -5,8 +5,8 @@
# Compilation options
CC=$(BYTECC)
CFLAGS=-I$(REGEXLIB) -I..\..\byterun $(BYTECCCOMPOPTS)
-CAMLC=..\..\boot\cslrun ..\..\boot\cslc -I ..\..\boot
-CAMLOPT=..\..\boot\cslrun ..\..\cslopt -I ..\..\stdlib
+CAMLC=..\..\boot\ocamlrun ..\..\boot\ocamlc -I ..\..\boot
+CAMLOPT=..\..\boot\ocamlrun ..\..\ocamlopt -I ..\..\stdlib
REGEXLIB=regex-0.12
REGEXFLAGS=-DREGEX_MALLOC -DSTDC_HEADERS $(BYTECCCOMPOPTS)
COBJS=strstubs.obj $(REGEXLIB)\regex.obj
@@ -27,7 +27,7 @@ str.cmxa: str.cmx
$(REGEXLIB)\regex.obj: $(REGEXLIB)\regex.c $(REGEXLIB)\regex.h
cd $(REGEXLIB) & $(CC) $(REGEXFLAGS) -c regex.c
-str.cmx: ..\..\cslopt
+str.cmx: ..\..\ocamlopt
clean:
rm -f *.cm*
@@ -56,6 +56,6 @@ installopt:
depend:
gcc -MM $(CFLAGS) *.c > .depend
- ..\..\tools\csldep *.mli *.ml >> .depend
+ ..\..\tools\ocamldep *.mli *.ml >> .depend
!include .depend
diff --git a/otherlibs/str/str.ml b/otherlibs/str/str.ml
index 1a123d323..1cede822c 100644
--- a/otherlibs/str/str.ml
+++ b/otherlibs/str/str.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli
index 3010c3fa6..d573a0f73 100644
--- a/otherlibs/str/str.mli
+++ b/otherlibs/str/str.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)