diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.nt | 16 | ||||
| -rw-r--r-- | asmrun/.cvsignore | 2 | ||||
| -rw-r--r-- | byterun/.cvsignore | 1 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/Makefile.shared | 2 | ||||
| -rw-r--r-- | otherlibs/win32graph/.cvsignore | 2 | ||||
| -rw-r--r-- | otherlibs/win32unix/.cvsignore | 26 |
7 files changed, 40 insertions, 15 deletions
@@ -17,9 +17,9 @@ include config/Makefile include stdlib/StdlibModules -CAMLC=boot/ocamlrun boot/ocamlc -strict-sequence -nostdlib -I boot -CAMLOPT=boot/ocamlrun ./ocamlopt -strict-sequence -nostdlib -I stdlib -I otherlibs/dynlink -COMPFLAGS=-warn-error A $(INCLUDES) +CAMLC=boot/ocamlrun boot/ocamlc -nostdlib -I boot +CAMLOPT=boot/ocamlrun ./ocamlopt -nostdlib -I stdlib -I otherlibs/dynlink +COMPFLAGS=-strict-sequence -warn-error A $(INCLUDES) LINKFLAGS= CAMLYACC=boot/ocamlyacc diff --git a/Makefile.nt b/Makefile.nt index f239f13d21..aec858cb51 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -17,9 +17,9 @@ include config/Makefile include stdlib/StdlibModules -CAMLC=boot/ocamlrun boot/ocamlc -I boot -CAMLOPT=boot/ocamlrun ./ocamlopt -I stdlib -I otherlibs/dynlink -COMPFLAGS=$(INCLUDES) +CAMLC=boot/ocamlrun boot/ocamlc -nostdlib -I boot +CAMLOPT=boot/ocamlrun ./ocamlopt -nostdlib -I stdlib -I otherlibs/dynlink +COMPFLAGS=-strict-sequence -warn-error A $(INCLUDES) LINKFLAGS= CAMLYACC=boot/ocamlyacc YACCFLAGS= @@ -596,18 +596,18 @@ alldepend:: # Camlp4 camlp4out: ocamlc otherlibraries ocamlbuild-mixed-boot ocamlbuild.byte - ./build/camlp4-byte-only.sh + OCAMLBUILD_FIND=/usr/bin/find ./build/camlp4-byte-only.sh camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot ocamlbuild.native - ./build/camlp4-native-only.sh + OCAMLBUILD_FIND=/usr/bin/find ./build/camlp4-native-only.sh # Ocamlbuild ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-mixed-boot - ./build/ocamlbuild-byte-only.sh + OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuild-byte-only.sh ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot - ./build/ocamlbuild-native-only.sh + OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuild-native-only.sh ocamlbuildlib.native: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot - ./build/ocamlbuildlib-native-only.sh + OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuildlib-native-only.sh .PHONY: ocamlbuild-mixed-boot diff --git a/asmrun/.cvsignore b/asmrun/.cvsignore index a213410697..b8ad3e1c18 100644 --- a/asmrun/.cvsignore +++ b/asmrun/.cvsignore @@ -35,6 +35,4 @@ unix.c dynlink.c signals.c debugger.c -*.obj -libasmrun.lib .depend.nt diff --git a/byterun/.cvsignore b/byterun/.cvsignore index b4714b0506..8873b77fb5 100644 --- a/byterun/.cvsignore +++ b/byterun/.cvsignore @@ -17,3 +17,4 @@ interp.a.lst .gdb_history *.so *.a +.depend.nt diff --git a/otherlibs/labltk/browser/Makefile.shared b/otherlibs/labltk/browser/Makefile.shared index dc556fd751..b80967086f 100644 --- a/otherlibs/labltk/browser/Makefile.shared +++ b/otherlibs/labltk/browser/Makefile.shared @@ -33,7 +33,7 @@ ocamlbrowser$(EXE): $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ) \ ../support/lib$(LIBNAME).$(A) $(XTRAOBJ) $(CAMLC) -o ocamlbrowser$(EXE) $(INCLUDES) \ $(TOPDIR)/toplevel/toplevellib.cma \ - unix.cma str.cma $(OCAMLBR) $(LIBNAME).cma jglib.cma \ + unix.cma str.cma $(XTRALIBS) $(LIBNAME).cma jglib.cma \ $(OBJ) $(XTRAOBJ) ocamlbrowser.cma: jglib.cma $(OBJ) diff --git a/otherlibs/win32graph/.cvsignore b/otherlibs/win32graph/.cvsignore new file mode 100644 index 0000000000..090a9a2537 --- /dev/null +++ b/otherlibs/win32graph/.cvsignore @@ -0,0 +1,2 @@ +graphics.ml +graphics.mli diff --git a/otherlibs/win32unix/.cvsignore b/otherlibs/win32unix/.cvsignore index 9aaa7161dd..e85bbd9af2 100644 --- a/otherlibs/win32unix/.cvsignore +++ b/otherlibs/win32unix/.cvsignore @@ -1,3 +1,27 @@ unixLabels.ml* unix.mli -unix.lib
\ No newline at end of file +unix.lib +access.c +addrofstr.c +chdir.c +chmod.c +cst2constr.c +cstringv.c +envir.c +execv.c +execve.c +execvp.c +exit.c +getcwd.c +gethost.c +gethostname.c +getproto.c +getserv.c +gmtime.c +putenv.c +rmdir.c +socketaddr.c +strofaddr.c +time.c +unlink.c +utimes.c |