summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2000-04-14 03:40:13 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2000-04-14 03:40:13 +0000
commit4b8f17953110817a9437cb70a3d68788b704c1a1 (patch)
tree777bfc3567c7a5ae5bd32f4cf55d316a521b1c39
parent82f43528ec491bc26489b1bf1cfcff5d6067069d (diff)
tk41.cma -> labltk.cma
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat
-rw-r--r--otherlibs/labltk/browser/Makefile2
-rw-r--r--otherlibs/labltk/browser/Makefile.nt2
-rw-r--r--otherlibs/labltk/browser/shell.ml2
-rw-r--r--otherlibs/labltk/example/Makefile16
-rw-r--r--otherlibs/labltk/example/README2
-rw-r--r--otherlibs/labltk/jpf/Makefile4
-rw-r--r--otherlibs/labltk/jpf/Makefile.nt4
-rw-r--r--otherlibs/labltk/lib/.cvsignore2
-rw-r--r--otherlibs/labltk/lib/Makefile49
-rw-r--r--otherlibs/labltk/lib/Makefile.nt25
-rw-r--r--otherlibs/labltk/support/Makefile6
11 files changed, 55 insertions, 59 deletions
diff --git a/otherlibs/labltk/browser/Makefile b/otherlibs/labltk/browser/Makefile
index 09c64f963..4f735b06c 100644
--- a/otherlibs/labltk/browser/Makefile
+++ b/otherlibs/labltk/browser/Makefile
@@ -29,7 +29,7 @@ all: ocamlbrowser
ocamlbrowser: $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ)
$(LABLC) -o ocamlbrowser $(INCLUDES) \
$(TOPDIR)/toplevel/toplevellib.cma \
- unix.cma str.cma tk41.cma jglib.cma $(OBJ) \
+ unix.cma str.cma labltk.cma jglib.cma $(OBJ) \
$(TKLINKOPT)
jglib.cma: $(JG)
diff --git a/otherlibs/labltk/browser/Makefile.nt b/otherlibs/labltk/browser/Makefile.nt
index e3e9f71c4..6acb1eb2f 100644
--- a/otherlibs/labltk/browser/Makefile.nt
+++ b/otherlibs/labltk/browser/Makefile.nt
@@ -29,7 +29,7 @@ all: ocamlbrowser
ocamlbrowser: $(TOPDIR)/toplevel/toplevellib.cma jglib.cma $(OBJ)
$(LABLC) -o ocamlbrowser $(INCLUDES) \
$(TOPDIR)/toplevel/toplevellib.cma \
- unix.cma threads.cma str.cma tk41.cma jglib.cma $(OBJ) \
+ unix.cma threads.cma str.cma labltk.cma jglib.cma $(OBJ) \
$(TKLINKOPT)
jglib.cma: $(JG)
diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml
index 6dfc7d643..10c132194 100644
--- a/otherlibs/labltk/browser/shell.ml
+++ b/otherlibs/labltk/browser/shell.ml
@@ -239,7 +239,7 @@ let get_all () =
all
let may_exec_unix prog =
- try Unix.access ~file:prog ~perm:[Unix.X_OK]; true
+ try Unix.access prog ~perm:[Unix.X_OK]; true
with Unix.Unix_error _ -> false
let may_exec_win prog =
diff --git a/otherlibs/labltk/example/Makefile b/otherlibs/labltk/example/Makefile
index 09ff25dde..beeb1250b 100644
--- a/otherlibs/labltk/example/Makefile
+++ b/otherlibs/labltk/example/Makefile
@@ -7,26 +7,26 @@ all: hello demo eyes calc clock tetris
opt: hello.opt demo.opt eyes.opt calc.opt clock.opt tetris.opt
hello: hello.cmo
- $(LABLC) $(COMPFLAGS) -o hello tk41.cma hello.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o hello labltk.cma hello.cmo $(TKLINKOPT)
demo: demo.cmo
- $(LABLC) $(COMPFLAGS) -o demo tk41.cma demo.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o demo labltk.cma demo.cmo $(TKLINKOPT)
eyes: eyes.cmo
- $(LABLC) $(COMPFLAGS) -o eyes tk41.cma eyes.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o eyes labltk.cma eyes.cmo $(TKLINKOPT)
calc: calc.cmo
- $(LABLC) $(COMPFLAGS) -o calc tk41.cma calc.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o calc labltk.cma calc.cmo $(TKLINKOPT)
clock: clock.cmo
- $(LABLC) $(COMPFLAGS) -o clock tk41.cma unix.cma clock.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o clock labltk.cma unix.cma clock.cmo $(TKLINKOPT)
clock.opt: clock.cmx
$(CAMLOPT) $(COMPFLAGS) -o clock.opt \
- tk41.cmxa unix.cmxa clock.cmx $(TKLINKOPT)
+ labltk.cmxa unix.cmxa clock.cmx $(TKLINKOPT)
tetris: tetris.cmo
- $(LABLC) $(COMPFLAGS) -o tetris tk41.cma tetris.cmo $(TKLINKOPT)
+ $(LABLC) $(COMPFLAGS) -o tetris labltk.cma tetris.cmo $(TKLINKOPT)
clean:
rm -f hello demo eyes calc clock tetris *.opt *.o *.cm*
@@ -44,4 +44,4 @@ clean:
$(CAMLOPT) -c $(COMPFLAGS) $<
.cmx.opt:
- $(CAMLOPT) $(COMPFLAGS) -o $@ tk41.cmxa $< $(TKLINKOPT)
+ $(CAMLOPT) $(COMPFLAGS) -o $@ labltk.cmxa $< $(TKLINKOPT)
diff --git a/otherlibs/labltk/example/README b/otherlibs/labltk/example/README
index dbb038b50..c3429eb20 100644
--- a/otherlibs/labltk/example/README
+++ b/otherlibs/labltk/example/README
@@ -2,6 +2,8 @@ $Id$
Some examples for LablTk.
Only demo.ml and tetris.ml really need to be compiled with the -labels option.
+You may either compile them here, or just run them as scripts with
+ labltk -labels example.ml
hello.ml A very simple example of CamlTk
hello.tcl The same programme in Tcl/Tk
diff --git a/otherlibs/labltk/jpf/Makefile b/otherlibs/labltk/jpf/Makefile
index 166ac738a..4689b24f2 100644
--- a/otherlibs/labltk/jpf/Makefile
+++ b/otherlibs/labltk/jpf/Makefile
@@ -33,11 +33,11 @@ clean:
balloontest: balloontest.cmo
$(LABLC) -o balloontest -I ../support -I ../lib \
- -custom tk41.cma libjpf.cma balloontest.cmo $(TKLINKOPT)
+ -custom labltk.cma libjpf.cma balloontest.cmo $(TKLINKOPT)
balloontest.opt: balloontest.cmx
$(CAMLOPT) -o balloontest.opt -I ../support -I ../lib \
- tk41.cmxa libjpf.cmxa balloontest.cmx $(TKLINKOPT)
+ labltk.cmxa libjpf.cmxa balloontest.cmx $(TKLINKOPT)
balloontest.cmo : balloon.cmo libjpf.cma
diff --git a/otherlibs/labltk/jpf/Makefile.nt b/otherlibs/labltk/jpf/Makefile.nt
index c485da2ef..8a0f58cb8 100644
--- a/otherlibs/labltk/jpf/Makefile.nt
+++ b/otherlibs/labltk/jpf/Makefile.nt
@@ -33,11 +33,11 @@ clean:
balloontest: balloontest.cmo
$(LABLC) -o balloontest -I ../support -I ../lib \
- -custom tk41.cma libjpf.cma balloontest.cmo $(TKLINKOPT)
+ -custom labltk.cma libjpf.cma balloontest.cmo $(TKLINKOPT)
balloontest.opt: balloontest.cmx
$(CAMLOPT) -o balloontest.opt -I ../support -I ../lib \
- tk41.cmxa libjpf.cmxa balloontest.cmx $(TKLINKOPT)
+ labltk.cmxa libjpf.cmxa balloontest.cmx $(TKLINKOPT)
balloontest.cmo : balloon.cmo libjpf.cma
diff --git a/otherlibs/labltk/lib/.cvsignore b/otherlibs/labltk/lib/.cvsignore
index 385e7229c..585067641 100644
--- a/otherlibs/labltk/lib/.cvsignore
+++ b/otherlibs/labltk/lib/.cvsignore
@@ -1,3 +1,3 @@
-*.ml *.mli labltktop labltk labltklink labltkopt
+*.ml *.mli labltktop labltk
modules
.depend
diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile
index 1f54cbed5..219034748 100644
--- a/otherlibs/labltk/lib/Makefile
+++ b/otherlibs/labltk/lib/Makefile
@@ -10,63 +10,54 @@ SUPPORTX = $(SUPPORT:.cmo=.cmx)
TOPDEPS = $(TOPDIR)/toplevel/toplevellib.cma $(TOPDIR)/toplevel/topmain.cmo
-all : tk41.cma labltktop labltk labltklink labltkopt
+all : labltk.cma labltktop labltk
-opt : tk41.cmxa
+opt : labltk.cmxa
include ./modules
WIDGETOBJSX = $(WIDGETOBJS:.cmo=.cmx)
-tk41.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo
- $(LABLLIBR) -custom -o tk41.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \
+labltk.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo
+ $(LABLLIBR) -custom -o labltk.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \
-cclib -llabltk41 $(TK_LINK) $(X11_LINK)
-tk41.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx
- $(CAMLOPTLIBR) -o tk41.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \
+labltk.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx
+ $(CAMLOPTLIBR) -o labltk.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \
-cclib -llabltk41 $(TK_LINK) $(X11_LINK)
labltktop : $(TOPDEPS) $(WIDGETOBJS) $(SUPPORT)
$(LABLC) -custom -linkall -o labltktop -I ../support $(TKLINKOPT) \
- -I $(TOPDIR)/toplevel toplevellib.cma tk41.cma topmain.cmo
+ -I $(TOPDIR)/toplevel toplevellib.cma labltk.cma \
+ -I $(OTHERS)/unix -ccopt -L$(OTHERS)/unix unix.cma \
+ -I $(OTHERS)/str -ccopt -L$(OTHERS)/str str.cma \
+ topmain.cmo
labltk: Makefile $(TOPDIR)/config/Makefile
@echo Generate $@
@echo "#!/bin/sh" > $@
- @echo 'exec $(LABLTKDIR)/labltktop -I $(LABLTKDIR) "$$@"' >> $@
-
-labltklink: Makefile $(TOPDIR)/config/Makefile
- @echo Generate $@
- @echo "#!/bin/sh" > $@
- @echo 'exec ocamlc -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cma "$$@"' >> $@
-
-labltkopt: Makefile $(TOPDIR)/config/Makefile
- @echo Generate $@
- @echo "#!/bin/sh" > $@
- @echo 'exec ocamlopt -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cmxa "$$@" ' >> $@
+ @echo 'exec $(LABLTKDIR)/labltktop -I $(LABLTKDIR) $$*' >> $@
# All .{ml,mli} files are generated in this directory
clean :
rm -f *.cm* *.ml *.mli *.o *.a labltktop
-install: tk41.cma labltktop labltk labltklink
+install: labltk.cma labltktop labltk
@if test -d $(LABLTKDIR); then : ; else mkdir $(LABLTKDIR); fi
- cp *.cmi tk41.cma labltktop $(LABLTKDIR)
+ cp *.cmi labltk.cma labltktop $(LABLTKDIR)
chmod 644 $(LABLTKDIR)/*.cmi
- chmod 644 $(LABLTKDIR)/tk41.cma
+ chmod 644 $(LABLTKDIR)/labltk.cma
chmod 755 $(LABLTKDIR)/labltktop
@if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
- cp labltk labltklink $(BINDIR)
- chmod 755 $(BINDIR)/labltk $(BINDIR)/labltklink
+ cp labltk $(BINDIR)
+ chmod 755 $(BINDIR)/labltk
-installopt: tk41.cmxa
+installopt: labltk.cmxa
@if test -d $(LABLTKDIR); then : ; else mkdir $(LABLTKDIR); fi
- cp tk41.cmxa tk41.a $(LABLTKDIR)
- chmod 644 $(LABLTKDIR)/tk41.cmxa
- chmod 644 $(LABLTKDIR)/tk41.a
+ cp labltk.cmxa labltk.a $(LABLTKDIR)
+ chmod 644 $(LABLTKDIR)/labltk.cmxa
+ chmod 644 $(LABLTKDIR)/labltk.a
@if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
- cp labltkopt $(BINDIR)
- chmod 755 $(BINDIR)/labltkopt
.SUFFIXES :
.SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
diff --git a/otherlibs/labltk/lib/Makefile.nt b/otherlibs/labltk/lib/Makefile.nt
index a353e9dc7..cc9f453a6 100644
--- a/otherlibs/labltk/lib/Makefile.nt
+++ b/otherlibs/labltk/lib/Makefile.nt
@@ -10,38 +10,41 @@ SUPPORTX = $(SUPPORT:.cmo=.cmx)
TOPDEPS = $(TOPDIR)/toplevel/toplevellib.cma $(TOPDIR)/toplevel/topmain.cmo
-all : tk41.cma labltk
+all : labltk.cma labltk
-opt : tk41.cmxa
+opt : labltk.cmxa
include ./modules
WIDGETOBJSX = $(WIDGETOBJS:.cmo=.cmx)
-tk41.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo
- $(LABLLIBR) -custom -o tk41.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \
+labltk.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo
+ $(LABLLIBR) -custom -o labltk.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \
-cclib -llabltk41 $(TK_LINK)
-tk41.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx
- $(CAMLOPTLIBR) -o tk41.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \
+labltk.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx
+ $(CAMLOPTLIBR) -o labltk.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \
-cclib -llabltk41 $(TK_LINK)
labltk : $(TOPDEPS) $(WIDGETOBJS) $(SUPPORT)
$(LABLC) -custom -linkall -o $@ -I ../support $(TKLINKOPT) \
- -I $(TOPDIR)/toplevel toplevellib.cma tk41.cma topmain.cmo
+ -I $(TOPDIR)/toplevel toplevellib.cma labltk.cma \
+ -I $(OTHERS)/win32unix -ccopt -L$(OTHERS)/unix unix.cma \
+ -I $(OTHERS)/str -ccopt -L$(OTHERS)/str str.cma \
+ topmain.cmo
# All .{ml,mli} files are generated in this directory
clean :
rm -f *.cm* *.ml *.mli *.o *.a labltktop
-install: tk41.cma labltk
+install: labltk.cma labltk
@if not exist $(LABLTKDIR) mkdir $(LABLTKDIR)
- cp *.cmi tk41.cma $(LABLTKDIR)
+ cp *.cmi labltk.cma $(LABLTKDIR)
@if not exist $(BINDIR) mkdir $(BINDIR)
cp labltk.exe $(BINDIR)
-installopt: tk41.cmxa
+installopt: labltk.cmxa
@if not exist $(LABLTKDIR) mkdir $(LABLTKDIR)
- cp tk41.cmxa tk41.lib $(LABLTKDIR)
+ cp labltk.cmxa labltk.lib $(LABLTKDIR)
.SUFFIXES :
.SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
diff --git a/otherlibs/labltk/support/Makefile b/otherlibs/labltk/support/Makefile
index 275ef0bf0..7e5cf0e47 100644
--- a/otherlibs/labltk/support/Makefile
+++ b/otherlibs/labltk/support/Makefile
@@ -29,9 +29,9 @@ PUB=fileevent.cmi fileevent.mli \
install: liblabltk41.a $(PUB)
if test -d $(LABLTKDIR); then : ; else mkdir $(LABLTKDIR); fi
cp $(PUB) $(LABLTKDIR)
- cp liblabltk41.a $(LABLTKDIR)
- cd $(LABLTKDIR); chmod 644 $(PUB) liblabltk41.a
- $(RANLIB) $(LABLTKDIR)/liblabltk41.a
+ cd $(LABLTKDIR); chmod 644 $(PUB)
+ cp liblabltk41.a $(LIBDIR)
+ chmod 644 $(LIBDIR)/liblabltk41.a
clean :
rm -f *.cm* *.o *.a
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-21 13:22:30 +0000