diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2001-07-12 12:56:18 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2001-07-12 12:56:18 +0000 |
commit | cd92c251f764c96f689ec368bf08818a970006da (patch) | |
tree | 9ac4382ff8102f816a8ff1522652c7cdcb3a7a19 /otherlibs/num | |
parent | fc53c99cdaa383612deaf1c41d92dee2c420dfa2 (diff) |
detabisation + suppression support MacOS/68k
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3574 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/num')
-rw-r--r-- | otherlibs/num/Makefile.Mac | 18 | ||||
-rw-r--r-- | otherlibs/num/Makefile.Mac.depend | 14 | ||||
-rw-r--r-- | otherlibs/num/bignum/Makefile.Mac | 48 |
3 files changed, 16 insertions, 64 deletions
diff --git a/otherlibs/num/Makefile.Mac b/otherlibs/num/Makefile.Mac index 19c1e14cf..b422a4521 100644 --- a/otherlibs/num/Makefile.Mac +++ b/otherlibs/num/Makefile.Mac @@ -15,8 +15,6 @@ # Makefile for the "num" (exact rational arithmetic) library # Compilation options -C = sc -COptions = -model far -i :bignum:h:,:::byterun:,:::config: -w 35 {cdbgflag} PPCC = mrc PPCCOptions = -i :bignum:h:,:::byterun:,:::config: -w 35 {cdbgflag} @@ -28,34 +26,27 @@ CAMLOBJS = int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo � CMIFILES = big_int.cmi nat.cmi num.cmi ratio.cmi arith_status.cmi -COBJS = nat_stubs.c.o PPCCOBJS = nat_stubs.c.x -all � libnums.o libnums.x nums.cma {CMIFILES} +all � libnums.x nums.cma {CMIFILES} nums.cma � {CAMLOBJS} {CAMLC} -a -o nums.cma {CAMLOBJS} -libnums.o � :bignum:libbignum.o {COBJS} - lib -o libnums.o :bignum:libbignum.o {COBJS} - 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 - -:bignum:libbignum.o � directory :bignum; domake C; directory :: install � - duplicate -y libnums.o libnums.x nums.cma {CMIFILES} "{LIBDIR}" + duplicate -y libnums.x nums.cma {CMIFILES} "{LIBDIR}" partialclean � delete -i �.cm[aio] || set status 0 clean � partialclean - delete -i �.[ox] || set status 0 + delete -i �.x || set status 0 directory :bignum; domake scratch; directory :: directory :test; domake clean; directory :: @@ -65,11 +56,8 @@ clean � partialclean .cmo � .ml {CAMLC} -c {COMPFLAGS} {default}.ml -nat_stubs.c.o � nat.h - depend � begin MakeDepend -w -objext .x �.c - MakeDepend -w �.c :::boot:ocamlrun :::tools:ocamldep �.mli �.ml end | streamedit -e "/�t/ replace // ' ' -c �" > Makefile.Mac.depend diff --git a/otherlibs/num/Makefile.Mac.depend b/otherlibs/num/Makefile.Mac.depend index 1a71c64ff..ed380238f 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 23:43:21 on 27 f�v 2001 by MakeDepend +# These dependencies were produced at 14:49:44 on Thu, Jul 12, 2001 by MakeDepend :nat_stubs.c.x � � :nat_stubs.c � @@ -10,18 +10,6 @@ "{CIncludes}"MacTypes.h � "{CIncludes}"MixedMode.h -#*** Dependencies: Cut here *** -# These dependencies were produced at 23:43:23 on 27 f�v 2001 by MakeDepend - -:nat_stubs.c.o � � - :nat_stubs.c � - "{CIncludes}"memory.h � - :nat.h � - "{CIncludes}"ConditionalMacros.h � - "{CIncludes}"MacMemory.h � - "{CIncludes}"MacTypes.h � - "{CIncludes}"MixedMode.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 3c477d881..9c7e73fc8 100644 --- a/otherlibs/num/bignum/Makefile.Mac +++ b/otherlibs/num/bignum/Makefile.Mac @@ -1,12 +1,5 @@ # Copyright Digital Equipment Corporation & INRIA 1988, 1989, 1992 -C = sc -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 {cdbgflag} PPCLinkOptions = {ldbgflag} @@ -14,10 +7,6 @@ PPCLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o" � "{ppclibraries}PPCToolLibs.o" "{sharedlibraries}StdCLib" � "{ppclibraries}StdCRuntime.o" "{sharedlibraries}InterfaceLib" -LIB = libbignum.o -OBJECT = :o:KerN.o :o:bnInit.o :o:bnMult.o :o:bnDivide.o :o:bnCmp.o :o:bzf.o � - :o:bz.o - PPCLIB = libbignum.x PPCOBJECT = :o:KerN.x :o:bnInit.x :o:bnMult.x :o:bnDivide.x :o:bnCmp.x � :o:bzf.x :o:bz.x @@ -36,55 +25,45 @@ default � #all � testKerN bztest # echo All is done -all � {LIB} {PPCLIB} +all � {PPCLIB} echo scratch � - delete -i :o:�.[ox] || set status 0 - delete -i libbignum.o libbignum.x + delete -i :o:�.x || set status 0 + delete -i libbignum.x delete -i bztest testKerN # build the BigNum library -{LIB} � {OBJECT} - lib -o {LIB} {OBJECT} - {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 +:o:KerN.x � :c:KerN.c echo "The Default is KerN written in C with digits on long" - domake C -d C="{C}" -d COptions="{COptions}" + domake C -d C="{PPCC}" -d COptions="{PPCCOptions}" C � scratch - {C} {COptions} :c:KerN.c -o :o:KerN.o {PPCC} {PPCCOptions} :c:KerN.c -o :o:KerN.x domake all -.o � .c {KERNH} - {C} {COptions} {depdir}{default}.c -o {targdir}{default}.o - .x � .c {KERNH} {PPCC} {PPCCOptions} {depdir}{default}.c -o {targdir}{default}.x :o: � :c: :c:bn: # Level N -:o:bnInit.o :o:bnInit.x � {KERNH} -:o:bnMult.o :o:bnMult.x � {KERNH} -:o:bnDivide.o :o:bnDivide.x � {KERNH} -:o:bnCmp.o :o:bnCmp.x � {KERNH} +:o:bnInit.x � {KERNH} +:o:bnMult.x � {KERNH} +:o:bnDivide.x � {KERNH} +:o:bnCmp.x � {KERNH} # Level Z -:o:bz.o :o:bz.x � :h:BigZ.h {KERNH} +:o:bz.x � :h:BigZ.h {KERNH} # Some functions built with BigZ -:o:bzf.o :o:bzf.x � :h:BigZ.h {KERNH} +:o:bzf.x � :h:BigZ.h {KERNH} # Tests Of KerN -testKerN �� :o:testKerN.o {LIB} - ilink -c 'MPS ' -t MPST :o:testKerN.o {LIB} {LinkOptions} -o testKerN {Libs} - testKerN �� :o:testKerN.x {PPCLIB} ppclink -c 'MPS ' -t MPST :o:testKerN.x {PPCLIB} {PPCLinkOptions} � -o testKerN {PPCLibs} @@ -92,11 +71,8 @@ testKerN �� :o:testKerN.x {PPCLIB} :o:testKerN.o :o:testKerN.x � {KERNH} # Tests Of BigZ -bztest �� :o:bztest.o {LIB} - ilink -c 'MPS ' -t MPST :o:bztest.o {LIB} {LinkOptions} -o bztest {Libs} - bztest �� :o:bztest.x {PPCLIB} ppclink -c 'MPS ' -t MPST :o:bztest.x {PPCLIB} {PPCLinkOptions} � -o bztest {PPCLibs} -:o:bztest.o :o:bztest.x � :h:BigZ.h {KERNH} +:o:bztest.x � :h:BigZ.h {KERNH} |