To apply this patch execute the following command in the ocaml-3.07 directory. patch -p0 < ../ocamlbrowser.opt-3.07-2.patch FTP Directory: sources/ocaml # Index: Makefile =================================================================== RCS file: /home/tak/CVSROOT/ocaml-3.07/Makefile,v retrieving revision 1.1.1.1 diff -C3 -r1.1.1.1 Makefile *** Makefile 24 Nov 2003 17:30:24 -0000 1.1.1.1 --- Makefile 24 Nov 2003 17:43:34 -0000 *************** *** 223,229 **** # Compile the native-code compiler opt-core:runtimeopt ocamlopt libraryopt ! opt: runtimeopt ocamlopt libraryopt otherlibrariesopt camlp4opt # Native-code versions of the tools opt.opt: checkstack core ocaml opt-core ocamlc.opt otherlibraries camlp4out \ --- 223,229 ---- # Compile the native-code compiler opt-core:runtimeopt ocamlopt libraryopt ! opt: runtimeopt ocamlopt libraryopt otherlibrariesopt camlp4opt ocamlbrowser.opt # Native-code versions of the tools opt.opt: checkstack core ocaml opt-core ocamlc.opt otherlibraries camlp4out \ *************** *** 277,282 **** --- 277,285 ---- if test -f lex/ocamllex.opt; \ then cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi + ocamlbrowser.opt: toplevel/toplevellib.cmxa + ( cd otherlibs/labltk/browser/ ; make $@ ) + clean:: partialclean # The compiler *************** *** 310,315 **** --- 313,322 ---- toplevel/toplevellib.cma: $(TOPLIB) $(CAMLC) -a -o $@ $(TOPLIB) + + TOPLIBX = $(TOPLIB:.cmo=.cmx) + toplevel/toplevellib.cmxa: $(TOPLIBX) + $(CAMLOPT) -a -o $@ $(TOPLIBX) partialclean:: rm -f ocaml toplevel/toplevellib.cma Index: otherlibs/labltk/browser/Makefile =================================================================== RCS file: /home/tak/CVSROOT/ocaml-3.07/otherlibs/labltk/browser/Makefile,v retrieving revision 1.1.1.1 diff -C3 -r1.1.1.1 Makefile *** otherlibs/labltk/browser/Makefile 24 Nov 2003 17:30:24 -0000 1.1.1.1 --- otherlibs/labltk/browser/Makefile 24 Nov 2003 23:25:31 -0000 *************** *** 2,8 **** LABLTKLIB=-I ../labltk -I ../lib -I ../support #OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/systhreads -I $(OTHERS)/str ! OTHERSLIB=-I $(OTHERS)/unix -I $(OTHERS)/str OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB) --- 2,8 ---- LABLTKLIB=-I ../labltk -I ../lib -I ../support #OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/systhreads -I $(OTHERS)/str ! OTHERSLIB=-I $(OTHERS)/unix -I $(OTHERS)/str OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB) *************** *** 16,31 **** --- 16,47 ---- jg_button.cmo jg_toplevel.cmo jg_text.cmo jg_message.cmo \ jg_menu.cmo jg_entry.cmo jg_multibox.cmo jg_memo.cmo + + OBJX = list2.cmx useunix.cmx setpath.cmx lexical.cmx \ + fileselect.cmx searchid.cmx searchpos.cmx shell.cmx \ + help.cmx \ + viewer.cmx typecheck.cmx editor.cmx main.cmx + + JGX = jg_tk.cmx jg_config.cmx jg_bind.cmx jg_completion.cmx \ + jg_box.cmx \ + jg_button.cmx jg_toplevel.cmx jg_text.cmx jg_message.cmx \ + jg_menu.cmx jg_entry.cmx jg_multibox.cmx jg_memo.cmx + # Default rules .SUFFIXES: .ml .mli .cmo .cmi .cmx + + .ml.cmx: + $(CAMLOPT) -c $(INCLUDES) $< + .ml.cmo: $(CAMLCOMP) $(INCLUDES) $< .mli.cmi: $(CAMLCOMP) $(INCLUDES) $< + all: ocamlbrowser$(EXE) ocamlbrowser$(EXE): $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ) \ *************** *** 34,44 **** --- 50,77 ---- $(TOPDIR)/toplevel/toplevellib.cma \ unix.cma str.cma $(LIBNAME).cma jglib.cma $(OBJ) + OBJX = $(OBJ:.cmo=.cmx) + ocamlbrowser.opt: $(TOPDIR)/toplevel/toplevellib.cmxa jglib.cmxa $(OBJX) \ + ../support/lib$(LIBNAME).a + $(CAMLOPT) -o ocamlbrowser.opt $(INCLUDES) \ + $(TOPDIR)/toplevel/toplevellib.cmxa \ + unix.cmxa str.cmxa $(LIBNAME).cmxa jglib.cmxa $(OBJX) + + $(TOPDIR)/toplevel/toplevellib.cmxa: + ( cd $(TOPDIR) ; make toplevel/toplevellib.cmxa ) + ocamlbrowser.cma: jglib.cma $(OBJ) $(CAMLC) -a -o $@ -linkall jglib.cma $(OBJ) jglib.cma: $(JG) $(CAMLCOMP) -a -o jglib.cma $(JG) + + JGX = $(JG:.cmo=.cmx) + jglib.cmxa: $(JGX) + $(CAMLOPT) -a -o $@ $(JGX) + + ocamlbrowser.cmxa: $(JGX) $(OBJX) + $(CAMLOPT) -a -o $@ $(JGX) $(OBJX) help.ml: echo 'let text = "\\' > $@