diff options
| author | Jun FURUSE / 古瀬 淳 <jun.furuse@gmail.com> | 2002-04-26 12:16:26 +0000 |
|---|---|---|
| committer | Jun FURUSE / 古瀬 淳 <jun.furuse@gmail.com> | 2002-04-26 12:16:26 +0000 |
| commit | c54baa5bd6c2a6d8addbea0613998e89d8cf4167 (patch) | |
| tree | fe926e50c17b7d67fcde37d2ef713bcc896a05e1 /otherlibs/labltk/browser | |
| parent | 82be04fd96c67653a27562c3f157674c99db84c2 (diff) | |
merge the branch mltk
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4745 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser')
| -rw-r--r-- | otherlibs/labltk/browser/Makefile | 16 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/Makefile.nt | 20 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/searchpos.ml | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/otherlibs/labltk/browser/Makefile b/otherlibs/labltk/browser/Makefile index 547d10e88..97aafd41c 100644 --- a/otherlibs/labltk/browser/Makefile +++ b/otherlibs/labltk/browser/Makefile @@ -1,6 +1,6 @@ include ../support/Makefile.common -LABLTKLIB=-I ../lib -I ../support +LABLTKLIB=-I ../labltk -I ../lib -I ../support OTHERSLIB=-I $(OTHERS)/unix -I $(OTHERS)/str OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB) @@ -20,22 +20,22 @@ JG = jg_tk.cmo jg_config.cmo jg_bind.cmo jg_completion.cmo \ .SUFFIXES: .ml .mli .cmo .cmi .cmx .ml.cmo: - $(LABLCOMP) $(INCLUDES) $< + $(CAMLCOMP) $(INCLUDES) $< .mli.cmi: - $(LABLCOMP) $(INCLUDES) $< + $(CAMLCOMP) $(INCLUDES) $< all: ocamlbrowser$(EXE) ocamlbrowser$(EXE): $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ) \ - ../support/liblabltk41.a - $(LABLC) -o ocamlbrowser$(EXE) $(INCLUDES) \ + ../support/lib$(LIBNAME).a + $(CAMLC) -o ocamlbrowser$(EXE) $(INCLUDES) \ $(DLLPATH) \ $(TOPDIR)/toplevel/toplevellib.cma \ - unix.cma str.cma labltk.cma jglib.cma $(OBJ) + unix.cma str.cma $(LIBNAME).cma jglib.cma $(OBJ) jglib.cma: $(JG) - $(LABLCOMP) -a -o jglib.cma $(JG) + $(CAMLCOMP) -a -o jglib.cma $(JG) #help.ml: help.txt # printf 'let text = "' > $@ @@ -50,7 +50,7 @@ clean: rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig depend: - $(LABLDEP) *.ml *.mli > .depend + $(CAMLDEP) *.ml *.mli > .depend dummy.mli: rm -f $@ diff --git a/otherlibs/labltk/browser/Makefile.nt b/otherlibs/labltk/browser/Makefile.nt index caa8f1176..43b3828b2 100644 --- a/otherlibs/labltk/browser/Makefile.nt +++ b/otherlibs/labltk/browser/Makefile.nt @@ -1,6 +1,6 @@ !include ..\support\Makefile.common.nt -LABLTKLIB=-I ../lib -I ../support +LABLTKLIB=-I ../labltk -I ../lib -I ../support OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB) @@ -21,35 +21,35 @@ JG = jg_tk.cmo jg_config.cmo jg_bind.cmo jg_completion.cmo \ .SUFFIXES: .ml .mli .cmo .cmi .cmx .ml.cmo: - $(LABLCOMP) $(INCLUDES) $< + $(CAMLCOMP) $(INCLUDES) $< .mli.cmi: - $(LABLCOMP) $(INCLUDES) $< + $(CAMLCOMP) $(INCLUDES) $< -.c.obj: +y.c.obj: $(BYTECC) $(BYTECCCOMPOPTS) $(CCFLAGS) -c $< all: ocamlbrowser.exe ocamlbrowser.exe: $(TOPDIR)/toplevel/toplevellib.cma \ - ..\support\liblabltk41.lib + ..\support\lib$(LIBNAME).lib ocamlbrowser.exe: jglib.cma $(OBJ) winmain.obj - $(LABLC) -o ocamlbrowser.exe -custom $(INCLUDES) \ + $(CAMLC) -o ocamlbrowser.exe -custom $(INCLUDES) \ $(TOPDIR)/toplevel/toplevellib.cma \ - unix.cma threads.cma str.cma labltk.cma jglib.cma $(OBJ) \ + unix.cma threads.cma str.cma $(LIBNAME).cma jglib.cma $(OBJ) \ winmain.obj -cclib "/subsystem:windows" jglib.cma: $(JG) - $(LABLCOMP) -a -o jglib.cma $(JG) + $(CAMLCOMP) -a -o jglib.cma $(JG) install: if exist ocamlbrowser.exe cp ocamlbrowser.exe $(BINDIR) clean: - rm -f *.cm? ocamlbrowser dummy.mli *~ *.orig + rm -f *.cm? ocamlbrowser.exe dummy.mli *~ *.orig *.obj *.pdb depend: - $(LABLDEP) *.ml *.mli > .depend + $(CAMLDEP) *.ml *.mli > .depend dummy.mli: cp dummyWin.mli dummy.mli diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml index 4302ad002..5e45718fe 100644 --- a/otherlibs/labltk/browser/searchpos.ml +++ b/otherlibs/labltk/browser/searchpos.ml @@ -255,7 +255,7 @@ let filter_modules () = Hashtbl.remove shown_modules key) shown_modules let add_shown_module path ~widgets = - Hashtbl'.add shown_modules ~key:path ~data:widgets + Hashtbl.add shown_modules path widgets let find_shown_module path = try filter_modules (); |