summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1999-02-24 16:01:41 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1999-02-24 16:01:41 +0000
commit138526c31b34e1007a4ebba88f31996aba6f1ed9 (patch)
tree4de4d9c39e4fe965c4766ec69b7bef1d4fa3c532
parent0b11fd35473a123c38e0f22b1efc852f79c26791 (diff)
MAJ portage Windows
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2306 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--otherlibs/systhreads/.depend14
-rw-r--r--otherlibs/systhreads/Makefile2
-rw-r--r--stdlib/Makefile.nt2
3 files changed, 6 insertions, 12 deletions
diff --git a/otherlibs/systhreads/.depend b/otherlibs/systhreads/.depend
index 39f5396a2..21c6e1148 100644
--- a/otherlibs/systhreads/.depend
+++ b/otherlibs/systhreads/.depend
@@ -15,8 +15,6 @@ win32.o: win32.c ../../byterun/alloc.h ../../byterun/misc.h \
../../byterun/roots.h ../../byterun/signals.h ../../byterun/stacks.h \
../../byterun/sys.h
condition.cmi: mutex.cmi
-thread.cmi: ../unix/unix.cmi
-threadUnix.cmi: ../unix/unix.cmi
condition.cmo: mutex.cmi condition.cmi
condition.cmx: mutex.cmx condition.cmi
event.cmo: condition.cmi mutex.cmi event.cmi
@@ -25,11 +23,7 @@ mutex.cmo: mutex.cmi
mutex.cmx: mutex.cmi
semaphore.cmo: semaphore.cmi
semaphore.cmx: semaphore.cmi
-thread.cmo: ../unix/unix.cmi thread.cmi
-thread.cmx: ../unix/unix.cmx thread.cmi
-threadUnix.cmo: thread.cmi ../unix/unix.cmi threadUnix.cmi
-threadUnix.cmx: thread.cmx ../unix/unix.cmx threadUnix.cmi
-thread_posix.cmo: ../unix/unix.cmi
-thread_posix.cmx: ../unix/unix.cmx
-thread_win32.cmo: ../unix/unix.cmi
-thread_win32.cmx: ../unix/unix.cmx
+thread.cmo: thread.cmi
+thread.cmx: thread.cmi
+threadUnix.cmo: thread.cmi threadUnix.cmi
+threadUnix.cmx: thread.cmx threadUnix.cmi
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index 0d369bba2..031f05c89 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -71,6 +71,6 @@ installopt:
depend: $(GENFILES)
gcc -MM -I../../byterun *.c > .depend
- ../../boot/ocamlrun ../../tools/ocamldep -I ../unix *.mli *.ml >> .depend
+ ../../boot/ocamlrun ../../tools/ocamldep *.mli *.ml >> .depend
include .depend
diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt
index b086eb326..23979826c 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 marshal.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 \
+ printf.cmo buffer.cmo format.cmo arg.cmo printexc.cmo gc.cmo \
digest.cmo random.cmo oo.cmo genlex.cmo callback.cmo weak.cmo \
lazy.cmo