12 files changed, 25 insertions, 31 deletions
diff --git a/otherlibs/bigarray/Makefile.Mac b/otherlibs/bigarray/Makefile.Mac
index e132c07a5..768b89fdf 100644
--- a/otherlibs/bigarray/Makefile.Mac
+++ b/otherlibs/bigarray/Makefile.Mac
@@ -13,10 +13,10 @@
 # $Id$
 
 C = sc
-COptions = -model far -i :::byterun:,:::config: -w 35
+COptions = -model far -i :::byterun:,:::config: -w 35 {cdbgflag}
 
 PPCC = mrc
-PPCCOptions = -i :::byterun:,:::config: -w 35
+PPCCOptions = -i :::byterun:,:::config: -w 35 {cdbgflag}
 
 CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -I ::unix:
 
@@ -28,7 +28,7 @@ CAML_OBJS = bigarray.cmo
 all Ä libbigarray.x libbigarray.o bigarray.cma
 
 libbigarray.x Ä {PPCC_OBJS}
-    ppclink -xm library -o libbigarray.x {PPCC_OBJS}
+    ppclink {ldbgflag} -xm library -o libbigarray.x {PPCC_OBJS}
 
 libbigarray.o Ä {C_OBJS}
     lib -o libbigarray.o {C_OBJS}
diff --git a/otherlibs/bigarray/Makefile.Mac.depend b/otherlibs/bigarray/Makefile.Mac.depend
index 506247105..65298c74b 100644
--- a/otherlibs/bigarray/Makefile.Mac.depend
+++ b/otherlibs/bigarray/Makefile.Mac.depend
@@ -1,5 +1,5 @@
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:49:43 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:16:55 on 7 avr 2000 by MakeDepend
 
 :bigarray_stubs.c.x Ä  ¶
  :bigarray_stubs.c ¶
@@ -36,7 +36,7 @@
  "{CIncludes}"WCharTDef.h
 
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:49:44 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:16:57 on 7 avr 2000 by MakeDepend
 
 :bigarray_stubs.c.o Ä  ¶
  :bigarray_stubs.c ¶
diff --git a/otherlibs/macosunix/Makefile.Mac b/otherlibs/macosunix/Makefile.Mac
index dd54e5179..19114a94b 100644
--- a/otherlibs/macosunix/Makefile.Mac
+++ b/otherlibs/macosunix/Makefile.Mac
@@ -12,9 +12,6 @@
 
 # $Id$
 
-#ldbgflag = -sym on
-#cdbgflag = -sym on -d DEBUG
-
 includepath = ":config:,:byterun:,{GUSI}include:"
 
 C = sc
diff --git a/otherlibs/macosunix/Makefile.Mac.depend b/otherlibs/macosunix/Makefile.Mac.depend
index d989b186b..874bb249e 100644
--- a/otherlibs/macosunix/Makefile.Mac.depend
+++ b/otherlibs/macosunix/Makefile.Mac.depend
@@ -1,5 +1,5 @@
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:15 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:10 on 7 avr 2000 by MakeDepend
 
 :accept.c.x Ä  ¶
  :accept.c ¶
@@ -433,7 +433,7 @@
  "{CIncludes}"MixedMode.h
 
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:22 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:16 on 7 avr 2000 by MakeDepend
 
 :accept.c.o Ä  ¶
  :accept.c ¶
diff --git a/otherlibs/num/Makefile.Mac b/otherlibs/num/Makefile.Mac
index e4fe24d69..19c1e14cf 100644
--- a/otherlibs/num/Makefile.Mac
+++ b/otherlibs/num/Makefile.Mac
@@ -16,9 +16,9 @@
 
 # Compilation options
 C = sc
-COptions = -model far -i :bignum:h:,:::byterun:,:::config: -w 35
+COptions = -model far -i :bignum:h:,:::byterun:,:::config: -w 35 {cdbgflag}
 PPCC = mrc
-PPCCOptions = -i :bignum:h:,:::byterun:,:::config: -w 35
+PPCCOptions = -i :bignum:h:,:::byterun:,:::config: -w 35 {cdbgflag}
 
 CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -w s
 CAMLOPT = :::boot:ocamlrun :::ocamlopt: -I :::stdlib: -w s
@@ -40,7 +40,7 @@ libnums.o Ä :bignum:libbignum.o {COBJS}
     lib -o libnums.o :bignum:libbignum.o {COBJS}
 
 libnums.x Ä :bignum:libbignum.x {PPCCOBJS}
-    ppclink -xm library -o libnums.x :bignum:libbignum.x {PPCCOBJS}
+    ppclink {ldbgflag} -xm library -o libnums.x :bignum:libbignum.x {PPCCOBJS}
 
 :bignum:libbignum.x Ä :bignum:libbignum.o
     echo -n
diff --git a/otherlibs/num/Makefile.Mac.depend b/otherlibs/num/Makefile.Mac.depend
index 0ca3a6e5b..aaea25f97 100644
--- a/otherlibs/num/Makefile.Mac.depend
+++ b/otherlibs/num/Makefile.Mac.depend
@@ -1,5 +1,5 @@
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:27 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:23 on 7 avr 2000 by MakeDepend
 
 :nat_stubs.c.x Ä  ¶
  :nat_stubs.c ¶
@@ -11,7 +11,7 @@
  "{CIncludes}"MixedMode.h
 
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:28 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:24 on 7 avr 2000 by MakeDepend
 
 :nat_stubs.c.o Ä  ¶
  :nat_stubs.c ¶
diff --git a/otherlibs/num/bignum/Makefile.Mac b/otherlibs/num/bignum/Makefile.Mac
index 2a5d80f28..3c477d881 100644
--- a/otherlibs/num/bignum/Makefile.Mac
+++ b/otherlibs/num/bignum/Makefile.Mac
@@ -1,15 +1,15 @@
 #  Copyright     Digital Equipment Corporation & INRIA     1988, 1989, 1992
 
 C = sc
-COptions = -model far -i :h: -d CAML_LIGHT -w 30
+COptions = -model far -i :h: -d CAML_LIGHT -w 30 {cdbgflag}
 LinkOptions = -state nouse -compact -model far
 Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
        "{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
        "{libraries}ToolLibs.o" "{libraries}Interface.o"
 
 PPCC = mrc
-PPCCOptions = -i :h: -d CAML_LIGHT -w 30
-PPCLinkOptions =
+PPCCOptions = -i :h: -d CAML_LIGHT -w 30 {cdbgflag}
+PPCLinkOptions = {ldbgflag}
 PPCLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o" ¶
           "{ppclibraries}PPCToolLibs.o" "{sharedlibraries}StdCLib" ¶
           "{ppclibraries}StdCRuntime.o" "{sharedlibraries}InterfaceLib"
@@ -49,7 +49,7 @@ scratch Ä
     lib -o {LIB} {OBJECT}
 
 {PPCLIB} Ä {PPCOBJECT}
-    ppclink -xm library -o {PPCLIB} {PPCOBJECT}
+    ppclink {ldbgflag} -xm library -o {PPCLIB} {PPCOBJECT}
 
 # How to choose the machine dependent version. All produce KerN.o
 :o:KerN.o Ä :c:KerN.c 
diff --git a/otherlibs/str/Makefile.Mac b/otherlibs/str/Makefile.Mac
index 0f910c604..aa6b96e7e 100644
--- a/otherlibs/str/Makefile.Mac
+++ b/otherlibs/str/Makefile.Mac
@@ -16,10 +16,10 @@
 
 # Compilation options
 C = sc
-COptions = -model far -i {REGEXLIB},:::byterun:,:::config: -w 7
+COptions = -model far -i {REGEXLIB},:::byterun:,:::config: -w 7 {cdbgflag}
 
 PPCC = mrc
-PPCCOptions = -i {REGEXLIB},:::byterun:,:::config: -w 7
+PPCCOptions = -i {REGEXLIB},:::byterun:,:::config: -w 7 {cdbgflag}
 
 CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib:
 REGEXLIB = :regex-0.12:
@@ -33,7 +33,7 @@ libstr.o Ä {COBJS}
     lib -o libstr.o {COBJS}
 
 libstr.x Ä {PPCCOBJS}
-    ppclink -xm library -o libstr.x {PPCCOBJS}
+    ppclink {ldbgflag} -xm library -o libstr.x {PPCCOBJS}
 
 str.cma Ä str.cmo
     {CAMLC} -a -o str.cma str.cmo
diff --git a/otherlibs/str/Makefile.Mac.depend b/otherlibs/str/Makefile.Mac.depend
index 34b37e985..1f6c5657d 100644
--- a/otherlibs/str/Makefile.Mac.depend
+++ b/otherlibs/str/Makefile.Mac.depend
@@ -1,5 +1,5 @@
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:33 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:29 on 7 avr 2000 by MakeDepend
 
 :strstubs.c.x Ä  ¶
  :strstubs.c ¶
@@ -13,7 +13,7 @@
  "{CIncludes}"MixedMode.h
 
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:35 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:31 on 7 avr 2000 by MakeDepend
 
 :strstubs.c.o Ä  ¶
  :strstubs.c ¶
diff --git a/otherlibs/str/regex-0.12/Makefile.Mac b/otherlibs/str/regex-0.12/Makefile.Mac
index f24949d14..dab5ab111 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 -w 29,35
+COptions = -model far -w 29,35 {cdbgflag}
 
 PPCC = mrc
-PPCCOptions = -w 29,35
+PPCCOptions = -w 29,35 {cdbgflag}
 
 DEFS = -d STDC_HEADERS -d STRING_H -d REGEX_MALLOC
 
diff --git a/otherlibs/systhreads/Makefile.Mac b/otherlibs/systhreads/Makefile.Mac
index 07891638e..4a84900aa 100644
--- a/otherlibs/systhreads/Makefile.Mac
+++ b/otherlibs/systhreads/Makefile.Mac
@@ -12,9 +12,6 @@
 
 # $Id$
 
-#cdbgflag = -sym on -d DEBUG
-#ldbgflag = -sym on
-
 C = sc
 COptions = -includes unix -i ":::byterun:,:::config:,{GUSI}include:" -w 35 ¶
            {cdbgflag} -model far
diff --git a/otherlibs/systhreads/Makefile.Mac.depend b/otherlibs/systhreads/Makefile.Mac.depend
index 1c466e91a..b61c20db9 100644
--- a/otherlibs/systhreads/Makefile.Mac.depend
+++ b/otherlibs/systhreads/Makefile.Mac.depend
@@ -1,5 +1,5 @@
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:42 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:38 on 7 avr 2000 by MakeDepend
 
 :posix.c.x Ä  ¶
  :posix.c ¶
@@ -52,7 +52,7 @@
  "{CIncludes}"DateTimeUtils.h
 
 #*** Dependencies: Cut here ***
-# These dependencies were produced at 14:50:47 on 3 avr 2000 by MakeDepend
+# These dependencies were produced at 17:17:43 on 7 avr 2000 by MakeDepend
 
 :posix.c.o Ä  ¶
  :posix.c ¶