diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2000-03-16 13:35:20 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2000-03-16 13:35:20 +0000 |
| commit | b070d1dce08a924cfdae5b5304318a990ebb73c8 (patch) | |
| tree | adbee9f1271b251af595e3a1ac42c545f02d3237 /otherlibs/labltk/lib | |
| parent | 3375e52091a4274b9503be74351a4aada59a94db (diff) | |
MAJ portage Win32
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2962 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/lib')
| -rw-r--r-- | otherlibs/labltk/lib/Makefile.gen.nt | 20 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile.nt | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/otherlibs/labltk/lib/Makefile.gen.nt b/otherlibs/labltk/lib/Makefile.gen.nt index c400a6665..ddee8f15c 100644 --- a/otherlibs/labltk/lib/Makefile.gen.nt +++ b/otherlibs/labltk/lib/Makefile.gen.nt @@ -8,23 +8,23 @@ tkgen.ml: ..\Widgets.src ..\compiler\tkcompiler # dependencies are broken: wouldn't work with gmake 3.77 tk.ml .depend: tkgen.ml ..\builtin\report.ml #../builtin/builtin_*.ml - cat << > tk.ml + type << > tk.ml open Widget open Protocol open Support open Textvariable << - cat ../builtin/report.ml >> tk.ml - cat ../builtin/builtin_*.ml >> tk.ml - cat tkgen.ml >> tk.ml - cat << >> tk.ml + type ..\builtin\report.ml >> tk.ml + type ..\builtin\builtin_*.ml >> tk.ml + type tkgen.ml >> tk.ml + type << >> tk.ml module Tkintf = struct << - cat ../builtin/builtini_*.ml >> tk.ml - cat tkigen.ml >> tk.ml - cat << >> tk.ml + type ..\builtin\builtini_*.ml >> tk.ml + type tkigen.ml >> tk.ml + type << >> tk.ml end (* module Tkintf *) @@ -32,6 +32,6 @@ open Tkintf << - cat ../builtin/builtinf_*.ml >> tk.ml - cat tkfgen.ml >> tk.ml + type ..\builtin\builtinf_*.ml >> tk.ml + type tkfgen.ml >> tk.ml $(LABLDEP) *.mli *.ml > .depend diff --git a/otherlibs/labltk/lib/Makefile.nt b/otherlibs/labltk/lib/Makefile.nt index 7b68a8683..a353e9dc7 100644 --- a/otherlibs/labltk/lib/Makefile.nt +++ b/otherlibs/labltk/lib/Makefile.nt @@ -18,10 +18,12 @@ include ./modules WIDGETOBJSX = $(WIDGETOBJS:.cmo=.cmx) tk41.cma : $(SUPPORT) $(WIDGETOBJS) tk.cmo - $(LABLLIBR) -o tk41.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) + $(LABLLIBR) -custom -o tk41.cma $(SUPPORT) tk.cmo $(WIDGETOBJS) \ + -cclib -llabltk41 $(TK_LINK) tk41.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx - $(CAMLOPTLIBR) -o tk41.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) + $(CAMLOPTLIBR) -o tk41.cmxa $(SUPPORTX) tk.cmx $(WIDGETOBJSX) \ + -cclib -llabltk41 $(TK_LINK) labltk : $(TOPDEPS) $(WIDGETOBJS) $(SUPPORT) $(LABLC) -custom -linkall -o $@ -I ../support $(TKLINKOPT) \ |