diff options
| -rw-r--r-- | otherlibs/graph/Makefile.nt | 52 | ||||
| -rw-r--r-- | otherlibs/labltk/examples_camltk/Makefile.nt | 2 | ||||
| -rw-r--r-- | otherlibs/labltk/examples_labltk/Makefile.nt | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/Tests/Makefile.nt | 23 | ||||
| -rw-r--r-- | test/Makefile.nt | 190 | ||||
| -rw-r--r-- | testasmcomp/Makefile.nt | 148 |
6 files changed, 13 insertions, 404 deletions
diff --git a/otherlibs/graph/Makefile.nt b/otherlibs/graph/Makefile.nt deleted file mode 100644 index 4d3f72b669..0000000000 --- a/otherlibs/graph/Makefile.nt +++ /dev/null @@ -1,52 +0,0 @@ -######################################################################### -# # -# Objective Caml # -# # -# Xavier Leroy, projet Cristal, INRIA Rocquencourt # -# # -# Copyright 1999 Institut National de Recherche en Informatique et # -# en Automatique. All rights reserved. This file is distributed # -# under the terms of the GNU Library General Public License, with # -# the special exception on linking described in file ../../LICENSE. # -# # -######################################################################### - -# $Id$ - -# Makefile for the portable graphics library - -!include ..\..\config\Makefile.nt - -CAMLC=..\..\boot\ocamlrun ..\..\ocamlc -I ..\..\boot -CAMLOPT=..\..\boot\ocamlrun ..\..\ocamlopt -I ..\..\stdlib - -all: graphics.cmi graphics.cmo graphics.cma - -allopt: - -graphics.cma: graphics.cmo - $(CAMLC) -a -o graphics.cma graphics.cmo - -partialclean: - rm -f *.cm* - -clean: partialclean - -install: - cp graphics.cm[ioa] $(LIBDIR) - -installopt: - -.SUFFIXES: .ml .mli .cmo .cmi .cmx - -.mli.cmi: - $(CAMLC) -c $< -.ml.cmo: - $(CAMLC) -c $< -.ml.cmx: - $(CAMLOPT) -c $(COMPFLAGS) $< - -depend: - ..\..\tools\ocamldep *.mli *.ml >> .depend - -!include .depend diff --git a/otherlibs/labltk/examples_camltk/Makefile.nt b/otherlibs/labltk/examples_camltk/Makefile.nt index 7b6b8f24b3..13f27a01da 100644 --- a/otherlibs/labltk/examples_camltk/Makefile.nt +++ b/otherlibs/labltk/examples_camltk/Makefile.nt @@ -1,4 +1,4 @@ -!include ..\support\Makefile.common.nt +include ../support/Makefile.common.nt # We are using the non-installed library ! COMPFLAGS= -I ../lib -I ../camltk -I ../support diff --git a/otherlibs/labltk/examples_labltk/Makefile.nt b/otherlibs/labltk/examples_labltk/Makefile.nt index fa58ea492b..825d9e42be 100644 --- a/otherlibs/labltk/examples_labltk/Makefile.nt +++ b/otherlibs/labltk/examples_labltk/Makefile.nt @@ -1,4 +1,4 @@ -!include ..\support\Makefile.common.nt +include ../support/Makefile.common.nt # We are using the non-installed library ! COMPFLAGS= -I ../lib -I ../labltk -I ../support diff --git a/otherlibs/systhreads/Tests/Makefile.nt b/otherlibs/systhreads/Tests/Makefile.nt index a939252855..bc3cf96afc 100644 --- a/otherlibs/systhreads/Tests/Makefile.nt +++ b/otherlibs/systhreads/Tests/Makefile.nt @@ -15,12 +15,14 @@ PROGS=test1.byt test2.byt test3.byt test4.byt test5.byt test6.byt \ test7.byt test8.byt test9.byt testA.byt sieve.byt \ - testio.byt testsocket.byt testwait.byt testsignal.byt testsignal2.byt + testio.byt testsocket.byt testwait.byt testsignal.byt testsignal2.byt \ + torture.byt -!include ../../../config/Makefile.nt +include ../../../config/Makefile -CAMLC=..\..\..\boot\ocamlrun ..\..\..\ocamlc -I .. -I ..\..\win32unix -I ..\..\..\stdlib -CAMLOPT=..\..\..\boot\ocamlrun ..\..\..\ocamlopt -I .. -I ..\..\win32unix -I ..\..\..\stdlib +CAMLC=../../../boot/ocamlrun ../../../ocamlc -I .. -I ../../unix -I ../../../stdlib + +CAMLOPT=../../../boot/ocamlrun ../../../ocamlopt -I .. -I ../../unix -I ../../../stdlib all: $(PROGS) @@ -30,15 +32,12 @@ clean: rm -f *.cm* *.byt *.out rm -f $(PROGS:.byt=.ml) -.SUFFIXES: .ml .byt .out - -{..\..\threads\Tests}.ml{}.byt: +%.byt: ../../threads/Tests/%.ml cp ../../threads/Tests/$*.ml $*.ml - $(CAMLC) -o $*.byt unix.cma threads.cma $*.ml + $(CAMLC) -custom -o $*.byt unix.cma threads.cma $*.ml ../libthreads.$(A) ../../unix/libunix.$(A) -{..\..\threads\Tests}.ml{}.out: +%.out: ../../threads/Tests/%.ml cp ../../threads/Tests/$*.ml $*.ml - $(CAMLOPT) -o $*.out unix.cmxa threads.cmxa $*.ml + $(CAMLOPT) -o $*.out unix.cmxa threads.cmxa $*.ml ../libthreadsnat.$(A) ../../unix/libunix.$(A) -cclib -lpthread -$(PROGS): ../threads.cma ../libthreads.lib -$(PROGS:.byt=.out): ../threads.cmxa ../libthreadsnat.lib +$(PROGS): ../threads.cma ../libthreads.$(A) diff --git a/test/Makefile.nt b/test/Makefile.nt deleted file mode 100644 index a6cdcae268..0000000000 --- a/test/Makefile.nt +++ /dev/null @@ -1,190 +0,0 @@ -######################################################################### -# # -# Objective Caml # -# # -# Xavier Leroy, projet Cristal, INRIA Rocquencourt # -# # -# Copyright 1999 Institut National de Recherche en Informatique et # -# en Automatique. All rights reserved. This file is distributed # -# under the terms of the Q Public License version 1.0. # -# # -######################################################################### - -# $Id$ - -!include ..\config\Makefile.nt - -CAMLC=..\boot\ocamlrun ..\ocamlc -CAMLOPT=..\boot\ocamlrun ..\ocamlopt -COMPFLAGS=-I ..\stdlib -I KB -I Lex -OPTFLAGS=-S -CAMLYACC=..\yacc\ocamlyacc -CAMLLEX=..\boot\ocamlrun ..\lex\ocamllex -CAMLDEP=..\boot\ocamlrun ..\tools\ocamldep -CAMLRUN=..\byterun\ocamlrun -CODERUNPARAMS=OCAMLRUNPARAM='o=100' - -BYTE_EXE=fib.byt takc.byt taku.byt sieve.byt quicksort.byt quicksort.fast.byt \ - fft.byt fft.fast.byt soli.byt soli.fast.byt boyer.byt kb.byt \ - nucleic.byt genlex.byt bdd.byt - -CODE_EXE=$(BYTE_EXE:.byt=.exe) - -all: $(BYTE_EXE) $(CODE_EXE) - -# Nucleic - -nucleic.exe: nucleic.ml -!if "$(ARCH)" == "i386" - sed -e "/<HAND_CSE>/,/<\/HAND_CSE>/d" -e "/NO_CSE>/d" nucleic.ml > nucleic.mlt - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -o nucleic.exe nucleic.mlt - rm -f nucleic.mlt -!else - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -o nucleic.exe nucleic.ml -!endif - -# KB - -BYTE_KB=KB\terms.cmo KB\equations.cmo KB\kb.cmo KB\orderings.cmo KB\kbmain.cmo -CODE_KB=$(BYTE_KB:.cmo=.cmx) - -kb.byt: $(BYTE_KB) - $(CAMLC) $(COMPFLAGS) $(BYTE_KB) -o kb.byt -kb.exe: $(CODE_KB) - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) $(CODE_KB) -o kb.exe - -clean:: - rm -f KB/*.cm* KB/*.obj KB/*.asm - -# Genlex - -BYTE_GENLEX=Lex\syntax.cmo Lex\scan_aux.cmo Lex\scanner.cmo Lex\gram_aux.cmo \ - Lex\grammar.cmo Lex\lexgen.cmo Lex\output.cmo Lex\main.cmo -CODE_GENLEX=$(BYTE_GENLEX:.cmo=.cmx) - -genlex.byt: $(BYTE_GENLEX) - $(CAMLC) $(COMPFLAGS) -I Lex $(BYTE_GENLEX) -o genlex.byt -genlex.exe: $(CODE_GENLEX) - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -I Lex $(CODE_GENLEX) -o genlex.exe - -clean:: - rm -f Lex/*.cm* Lex/*.obj Lex/*.asm - -Lex\grammar.ml Lex\grammar.mli: Lex\grammar.mly ..\yacc\ocamlyacc.exe - $(CAMLYACC) $(YACCFLAGS) Lex\grammar.mly - -clean:: - rm -f Lex\grammar.ml Lex\grammar.mli -beforedepend:: Lex\grammar.ml Lex\grammar.mli - -Lex\scanner.ml: Lex\scanner.mll ..\lex\ocamllex - $(CAMLLEX) Lex\scanner.mll - -clean:: - rm -f Lex\scanner.ml -beforedepend:: Lex\scanner.ml - -# "Fast" stuff - -quicksort.fast.byt: quicksort.ml - cp quicksort.ml quicksort.fast.ml - $(CAMLC) $(COMPFLAGS) -unsafe -o quicksort.fast.byt quicksort.fast.ml - rm -f quicksort.fast.ml - -soli.fast.byt: soli.ml - cp soli.ml soli.fast.ml - $(CAMLC) $(COMPFLAGS) -unsafe -o soli.fast.byt soli.fast.ml - rm -f soli.fast.ml - -fft.fast.byt: fft.ml - cp fft.ml fft.fast.ml - $(CAMLC) $(COMPFLAGS) -unsafe -o fft.fast.byt fft.fast.ml - rm -f fft.fast.ml - -quicksort.fast.exe: quicksort.ml - cp quicksort.ml quicksort.fast.ml - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -unsafe -o quicksort.fast.exe quicksort.fast.ml - rm -f quicksort.fast.ml - -soli.fast.exe: soli.ml - cp soli.ml soli.fast.ml - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -unsafe -o soli.fast.exe soli.fast.ml - rm -f soli.fast.ml - -fft.fast.exe: fft.ml - cp fft.ml fft.fast.ml - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -unsafe -o fft.fast.exe fft.fast.ml - rm -f fft.fast.ml - -# Common rules - -.SUFFIXES: -.SUFFIXES: .mli .ml .cmi .cmo .cmx .byt .exe - -.ml.byt: - $(CAMLC) $(COMPFLAGS) -o $*.byt $< - -.ml.exe: - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -o $*.exe $< - -.mli.cmi: - $(CAMLC) $(COMPFLAGS) -c $< - -.ml.cmo: - $(CAMLC) $(COMPFLAGS) -c $< - -.ml.cmx: - $(CAMLOPT) $(COMPFLAGS) $(OPTFLAGS) -c $< - -$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ..\ocamlc -$(BYTE_EXE): ..\stdlib\stdlib.cma -$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ..\ocamlopt -$(CODE_EXE): ..\stdlib\stdlib.cmxa ..\stdlib\libasmrun.lib - -clean:: - rm -f *.byt *.exe - rm -f *.cm* *.obj *.asm - -# Regression test - -.SUFFIXES: .btst .etst - -.byt.btst: - $(CAMLRUN) $*.byt > %temp%\test.out - cmp %temp%\test.out Results\$*.out -.exe.etst: - $*.exe > %temp%\test.out - cmp %temp%\test.out Results\$*.out - -clean:: - rm -f %temp%\test.out - -genlex.btst: - $(CAMLRUN) genlex.byt Lex/testscanner.mll -genlex.etst: - genlex.exe Lex/testscanner.mll - -FFT_TEST=gawk "$$2 >= 1e-9 { exit 2; }" -fft.btst: - $(CAMLRUN) fft.byt | $(FFT_TEST) -fft.fast.btst: - $(CAMLRUN) fft.fast.byt | $(FFT_TEST) -fft.etst: - fft.exe | $(FFT_TEST) -fft.fast.etst: - fft.fast.exe | $(FFT_TEST) - -test: codetest -bytetest: $(BYTE_EXE:.byt=.btst) -codetest: $(CODE_EXE:.exe=.etst) - -clean:: - rm -f Lex\testscanner.ml - -# Dependencies - -depend: beforedepend - $(CAMLDEP) -I KB -I Lex *.mli *.ml KB/*.mli KB/*.ml Lex/*.mli Lex/*.ml > .depend - -!include .depend - diff --git a/testasmcomp/Makefile.nt b/testasmcomp/Makefile.nt deleted file mode 100644 index c8a9f29994..0000000000 --- a/testasmcomp/Makefile.nt +++ /dev/null @@ -1,148 +0,0 @@ -######################################################################### -# # -# Objective Caml # -# # -# Xavier Leroy, projet Cristal, INRIA Rocquencourt # -# # -# Copyright 1999 Institut National de Recherche en Informatique et # -# en Automatique. All rights reserved. This file is distributed # -# under the terms of the Q Public License version 1.0. # -# # -######################################################################### - -# $Id$ - -!include ..\config\Makefile.nt - -CAMLC=..\boot\ocamlrun ..\boot\ocamlc -I ..\boot -COMPFLAGS=$(INCLUDES) -LINKFLAGS= -CAMLYACC=..\boot\ocamlyacc -YACCFLAGS= -CAMLLEX=..\boot\ocamlrun ..\boot\ocamllex -CAMLDEP=..\boot\ocamlrun ..\tools\ocamldep -DEPFLAGS=$(INCLUDES) -CAMLRUN=..\boot\ocamlrun - -CODEGEN=.\codegen -CC=$(NATIVECC) -CFLAGS= - -PROGS=fib.exe tak.exe quicksort.exe quicksort2.exe soli.exe integr.exe \ - arith.exe checkbound.exe - -all: codegen $(PROGS) - -INCLUDES=-I ..\utils -I ..\typing -I ..\asmcomp - -OTHEROBJS=..\utils\misc.cmo ..\utils\tbl.cmo \ - ..\utils\clflags.cmo ..\utils\config.cmo \ - ..\parsing\location.cmo \ - ..\typing\ident.cmo ..\typing\path.cmo ..\typing\subst.cmo \ - ..\typing\primitive.cmo ..\typing\predef.cmo ..\typing\printtyp.cmo \ - ..\typing\datarepr.cmo ..\typing\env.cmo \ - ..\bytecomp\lambda.cmo \ - ..\asmcomp\arch.cmo ..\asmcomp\cmm.cmo ..\asmcomp\printcmm.cmo \ - ..\asmcomp\clambda.cmo ..\asmcomp\compilenv.cmo \ - ..\asmcomp\reg.cmo ..\asmcomp\mach.cmo ..\asmcomp\proc.cmo \ - ..\asmcomp\closure.cmo ..\asmcomp\cmmgen.cmo \ - ..\asmcomp\printmach.cmo ..\asmcomp\selection.cmo ..\asmcomp\liveness.cmo \ - ..\asmcomp\spill.cmo ..\asmcomp\split.cmo \ - ..\asmcomp\interf.cmo ..\asmcomp\coloring.cmo ..\asmcomp\reload.cmo \ - ..\asmcomp\linearize.cmo ..\asmcomp\scheduling.cmo \ - ..\asmcomp\printlinear.cmo ..\asmcomp\emitaux.cmo \ - ..\asmcomp\emit.cmo ..\asmcomp\asmgen.cmo - -OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo main.cmo - -codegen: $(OTHEROBJS) $(OBJS) - $(CAMLC) $(LINKFLAGS) -o codegen $(OTHEROBJS) $(OBJS) -clean:: - rm -f codegen - -# The parser - -parsecmm.mli parsecmm.ml: parsecmm.mly - $(CAMLYACC) $(YACCFLAGS) parsecmm.mly - -clean:: - rm -f parsecmm.mli parsecmm.ml parsecmm.output - -beforedepend:: parsecmm.mli parsecmm.ml - -# The lexer - -lexcmm.ml: lexcmm.mll - $(CAMLLEX) lexcmm.mll - -clean:: - rm -f lexcmm.ml - -beforedepend:: lexcmm.ml - -# The test programs - -$(PROGS:.exe=.obj): codegen - -fib.exe: main.c fib.obj $(ARCH).obj - $(CC) $(CFLAGS) -o fib.exe -DINT_INT -DFUN=fib main.c fib.obj $(ARCH).obj - -tak.exe: main.c tak.obj $(ARCH).obj - $(CC) $(CFLAGS) -o tak.exe -DUNIT_INT -DFUN=takmain main.c tak.obj $(ARCH).obj - -quicksort.exe: main.c quicksort.obj $(ARCH).obj - $(CC) $(CFLAGS) -o quicksort.exe -DSORT -DFUN=quicksort main.c quicksort.obj $(ARCH).obj - -quicksort2.exe: main.c quicksort2.obj $(ARCH).obj - $(CC) $(CFLAGS) -o quicksort2.exe -DSORT -DFUN=quicksort main.c quicksort2.obj $(ARCH).obj - -soli.exe: main.c soli.obj $(ARCH).obj - $(CC) $(CFLAGS) -o soli.exe -DUNIT_INT -DFUN=solitaire main.c soli.obj $(ARCH).obj - -integr.exe: main.c integr.obj $(ARCH).obj - $(CC) $(CFLAGS) -o integr.exe -DINT_FLOAT -DFUN=test main.c integr.obj $(ARCH).obj - -tagged-fib.exe: main.c tagged-fib.obj $(ARCH).obj - $(CC) $(CFLAGS) -o tagged-fib.exe -DINT_INT -DFUN=fib main.c tagged-fib.obj $(ARCH).obj - -tagged-tak.exe: main.c tagged-tak.obj $(ARCH).obj - $(CC) $(CFLAGS) -o tagged-tak.exe -DUNIT_INT -DFUN=takmain main.c tagged-tak.obj $(ARCH).obj - -tagged-quicksort.exe: main.c tagged-quicksort.obj $(ARCH).obj - $(CC) $(CFLAGS) -o tagged-quicksort.exe -DSORT -DFUN=quicksort main.c tagged-quicksort.obj $(ARCH).obj - -tagged-integr.exe: main.c tagged-integr.obj $(ARCH).obj - $(CC) $(CFLAGS) -o tagged-integr.exe -DINT_FLOAT -DFUN=test main.c tagged-integr.obj $(ARCH).obj - -arith.exe: mainarith.c arith.obj $(ARCH).obj - $(CC) $(CFLAGS) -o arith.exe mainarith.c arith.obj $(ARCH).obj - -checkbound.exe: main.c checkbound.obj $(ARCH).obj - $(CC) $(CFLAGS) -o checkbound.exe -DCHECKBOUND main.c checkbound.obj $(ARCH).obj - -$(ARCH).obj: $(ARCH)nt.asm - $(AS) $(AFLAGS) /c /Fo$(ARCH).obj $(ARCH)nt.asm - -.SUFFIXES: -.SUFFIXES: .cmm .obj .ml .mli .cmo .cmi - -.ml.cmo: - $(CAMLC) $(COMPFLAGS) -c $< - -.mli.cmi: - $(CAMLC) $(COMPFLAGS) -c $< - -.cmm.obj: - $(CAMLRUN) $(CODEGEN) $*.cmm > $*.asm - $(AS) $(AFLAGS) /c $*.asm - -clean:: - rm -f *.exe *.cm* *.obj *~ - rm -f $(PROGS:.exe=.asm) - -$(PROGS:.exe=.obj): $(CODEGEN) - -depend: beforedepend - $(CAMLDEP) $(DEPFLAGS) *.mli *.ml > .depend - -!include .depend |