diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2011-09-15 13:38:45 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2011-09-15 13:38:45 +0000 |
| commit | 9ef7e04cf375e629dacf7d0aa75d9460a437bbee (patch) | |
| tree | af66779f118de7d308d1f97208d6ffd3213a1cf2 | |
| parent | 37b6033e8a3dc8db12dadfc8356e76b3aa9b89bc (diff) | |
Jonathan's updates to the Windows/Mingw port
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11197 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile.nt | 12 | ||||
| -rw-r--r-- | config/Makefile.mingw | 1 | ||||
| -rw-r--r-- | ocamldoc/Makefile.nt | 6 | ||||
| -rw-r--r-- | otherlibs/labltk/support/Makefile | 3 |
4 files changed, 7 insertions, 15 deletions
diff --git a/Makefile.nt b/Makefile.nt index 8d04735a6..cf9a4bb28 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -37,7 +37,7 @@ UTILS=utils/misc.cmo utils/tbl.cmo utils/config.cmo \ OPTUTILS=$(UTILS) -PARSING=parsing/linenum.cmo parsing/location.cmo parsing/longident.cmo \ +PARSING=parsing/location.cmo parsing/longident.cmo \ parsing/syntaxerr.cmo parsing/parser.cmo \ parsing/lexer.cmo parsing/parse.cmo parsing/printast.cmo @@ -366,16 +366,6 @@ partialclean:: beforedepend:: parsing/lexer.ml -# The auxiliary lexer for counting line numbers - -parsing/linenum.ml: parsing/linenum.mll - $(CAMLLEX) parsing/linenum.mll - -partialclean:: - rm -f parsing/linenum.ml - -beforedepend:: parsing/linenum.ml - # The bytecode compiler compiled with the native-code compiler ocamlc.opt: $(COMPOBJS:.cmo=.cmx) diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 2be898e52..9e79bc954 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -65,6 +65,7 @@ ASM=as ASPP=gcc ASPPPROFFLAGS= PROFILING=noprof +RUNTIMED=noruntimed DYNLINKOPTS= DEBUGGER=ocamldebugger CC_PROFILE= diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt index bdc230d2f..a65b59738 100644 --- a/ocamldoc/Makefile.nt +++ b/ocamldoc/Makefile.nt @@ -66,8 +66,8 @@ COMPFLAGS=$(INCLUDES) LINKFLAGS=$(INCLUDES) -nostdlib CMOFILES= odoc_config.cmo \ - odoc_global.cmo\ odoc_messages.cmo\ + odoc_global.cmo\ odoc_types.cmo\ odoc_misc.cmo\ odoc_text_parser.cmo\ @@ -82,7 +82,6 @@ CMOFILES= odoc_config.cmo \ odoc_module.cmo\ odoc_print.cmo \ odoc_str.cmo\ - odoc_args.cmo\ odoc_comments_global.cmo\ odoc_parser.cmo\ odoc_lexer.cmo\ @@ -115,6 +114,8 @@ EXECMOFILES=$(CMOFILES)\ odoc_latex.cmo\ odoc_texi.cmo\ odoc_dot.cmo\ + odoc_gen.cmo\ + odoc_args.cmo\ odoc.cmo @@ -135,7 +136,6 @@ OCAMLCMOFILES=$(OCAMLSRCDIR)/parsing/printast.cmo \ $(OCAMLSRCDIR)/utils/warnings.cmo \ $(OCAMLSRCDIR)/utils/ccomp.cmo \ $(OCAMLSRCDIR)/utils/consistbl.cmo \ - $(OCAMLSRCDIR)/parsing/linenum.cmo\ $(OCAMLSRCDIR)/parsing/location.cmo\ $(OCAMLSRCDIR)/parsing/longident.cmo \ $(OCAMLSRCDIR)/parsing/syntaxerr.cmo \ diff --git a/otherlibs/labltk/support/Makefile b/otherlibs/labltk/support/Makefile index 382f12c66..26f4c50f1 100644 --- a/otherlibs/labltk/support/Makefile +++ b/otherlibs/labltk/support/Makefile @@ -32,9 +32,10 @@ CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) COMPFLAGS=-I $(OTHERS)/win32unix -I $(OTHERS)/unix THFLAGS=-I $(OTHERS)/systhreads -I $(OTHERS)/threads +TKLDOPTS=$(TK_LINK:%=-ldopt "%") lib$(LIBNAME).$(A): $(COBJS) - $(MKLIB) -o $(LIBNAME) $(COBJS) -ldopt "$(TK_LINK)" + $(MKLIB) -o $(LIBNAME) $(COBJS) $(TKLDOPTS) PUBMLI=fileevent.mli protocol.mli textvariable.mli timer.mli \ rawwidget.mli widget.mli |