7 files changed, 22 insertions, 34 deletions
diff --git a/otherlibs/graph/graphics.mli b/otherlibs/graph/graphics.mli
index 086a9d277..a9aa07d3b 100644
--- a/otherlibs/graph/graphics.mli
+++ b/otherlibs/graph/graphics.mli
@@ -42,19 +42,19 @@ external size_y : unit -> int = "gr_size_y"
 
 external auto_flush : bool -> unit = "gr_auto_flush"
         (* Set auto-flush mode on/off.  When turned off, drawings are done
-	   in the backing store window but no more in the graphics window
-	   itself.  This creates a simple effect of double buffering, by
-	   allowing the user to do complex drawings in the backing store
-	   while keeping older drawings on the screen.  The contents
-	   of the backing store is copied onto the graphics window by
-	   a call to [flush] (see below).  By default, auto-flush mode is
-	   on, and all drawings are done both in the backing store and in
-	   the graphics window. *)
+           in the backing store window but no more in the graphics window
+           itself.  This creates a simple effect of double buffering, by
+           allowing the user to do complex drawings in the backing store
+           while keeping older drawings on the screen.  The contents
+           of the backing store is copied onto the graphics window by
+           a call to [flush] (see below).  By default, auto-flush mode is
+           on, and all drawings are done both in the backing store and in
+           the graphics window. *)
 
 external flush : unit -> unit = "gr_flush"
         (* Flush the contents of the backing store onto the graphics
-	   window.  This function is automatically called each time
-	   auto-flush mode is enabled. *)
+           window.  This function is automatically called each time
+           auto-flush mode is enabled. *)
 
 (*** Colors *)
 
@@ -105,7 +105,7 @@ external lineto : x:int -> y:int -> unit = "gr_lineto"
         (* Draw a line with endpoints the current point and the given point,
            and move the current point to the given point. *)
 external draw_arc :
-	x:int -> y:int -> rx:int -> ry:int -> start:int -> stop:int -> unit
+        x:int -> y:int -> rx:int -> ry:int -> start:int -> stop:int -> unit
                = "gr_draw_arc" "gr_draw_arc_nat"
         (* [draw_arc x y rx ry a1 a2] draws an elliptical arc with center
            [x,y], horizontal radius [rx], vertical radius [ry], from angle
diff --git a/otherlibs/num/Makefile.Mac b/otherlibs/num/Makefile.Mac
index eff8babe0..ebc624c85 100644
--- a/otherlibs/num/Makefile.Mac
+++ b/otherlibs/num/Makefile.Mac
@@ -16,13 +16,13 @@
 
 # Compilation options
 C = sc
-COptions = -model far -i :bignum:h:,:::byterun:
-CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -w s
-CAMLOPT = :::boot:ocamlrun :::ocamlopt: -I :::stdlib: -w s
-
+COptions = -model far -i :bignum:h:,:::byterun: -w 35
 PPCC = mrc
 PPCCOptions = -i :bignum:h:,:::byterun: -w 35
 
+CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -w s
+CAMLOPT = :::boot:ocamlrun :::ocamlopt: -I :::stdlib: -w s
+
 CAMLOBJS = int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo �
   ratio.cmo num.cmo arith_status.cmo
 
@@ -68,5 +68,6 @@ clean � partialclean
 nat_stubs.c.o � nat.h
 
 depend �
-    MakeDepend �.c > Makefile.Mac.depend
+    MakeDepend �.c > Makefile.Mac.depend � dev:null
+    MakeDepend -objext .x �.c >> Makefile.Mac.depend � dev:null
     :::boot:ocamlrun :::tools:ocamldep �.mli �.ml >> Makefile.Mac.depend
diff --git a/otherlibs/num/Makefile.Mac.depend b/otherlibs/num/Makefile.Mac.depend
index 7c0efa715..08121564b 100644
--- a/otherlibs/num/Makefile.Mac.depend
+++ b/otherlibs/num/Makefile.Mac.depend
@@ -1,11 +1,3 @@
-
-"nat_stubs.c.x" �  nat_stubs.c �
-                              nat.h
-
-
-"nat_stubs.c.o" �  nat_stubs.c �
-                              nat.h
-
 big_int.cmi� nat.cmi 
 num.cmi� big_int.cmi nat.cmi ratio.cmi 
 ratio.cmi� big_int.cmi nat.cmi 
diff --git a/otherlibs/num/bignum/Makefile.Mac b/otherlibs/num/bignum/Makefile.Mac
index 8246a7d78..2a5d80f28 100644
--- a/otherlibs/num/bignum/Makefile.Mac
+++ b/otherlibs/num/bignum/Makefile.Mac
@@ -1,7 +1,7 @@
 #  Copyright     Digital Equipment Corporation & INRIA     1988, 1989, 1992
 
 C = sc
-COptions = -model far -i :h: -d CAML_LIGHT
+COptions = -model far -i :h: -d CAML_LIGHT -w 30
 LinkOptions = -state nouse -compact -model far
 Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" �
        "{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" �
diff --git a/otherlibs/str/Makefile.Mac b/otherlibs/str/Makefile.Mac
index 8bfc2c417..4e3164769 100644
--- a/otherlibs/str/Makefile.Mac
+++ b/otherlibs/str/Makefile.Mac
@@ -61,5 +61,6 @@ install �
     {CAMLC} -c {COMPFLAGS} {default}.ml
 
 depend �
-    MakeDepend �.c > Makefile.Mac.depend
+    MakeDepend �.c > Makefile.Mac.depend � dev:null
+    MakeDepend -objext .x �.c >> Makefile.Mac.depend � dev:null
     :::boot:ocamlrun :::tools:ocamldep �.mli �.ml >> Makefile.Mac.depend
diff --git a/otherlibs/str/Makefile.Mac.depend b/otherlibs/str/Makefile.Mac.depend
index 1730d60cf..84d984a63 100644
--- a/otherlibs/str/Makefile.Mac.depend
+++ b/otherlibs/str/Makefile.Mac.depend
@@ -1,8 +1,2 @@
-
-"strstubs.c.x" �  strstubs.c
-
-
-"strstubs.c.o" �  strstubs.c
-
 str.cmo� str.cmi 
 str.cmx� str.cmi 
diff --git a/otherlibs/str/regex-0.12/Makefile.Mac b/otherlibs/str/regex-0.12/Makefile.Mac
index f292e6ddf..f24949d14 100644
--- a/otherlibs/str/regex-0.12/Makefile.Mac
+++ b/otherlibs/str/regex-0.12/Makefile.Mac
@@ -28,10 +28,10 @@ version = 0.12
 CPPFLAGS = 
 
 C = sc
-COptions = -model far
+COptions = -model far -w 29,35
 
 PPCC = mrc
-PPCCOptions = -w 29 -w 35
+PPCCOptions = -w 29,35
 
 DEFS = -d STDC_HEADERS -d STRING_H -d REGEX_MALLOC