diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2000-03-12 13:11:26 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2000-03-12 13:11:26 +0000 |
| commit | 6bcd8db2b220458abd55a9658c78ae3671b7085d (patch) | |
| tree | a97215b47cc2b334b4ead3cdfd435ddf193b857a /otherlibs/labltk/lib | |
| parent | c4801c35fb1a6dd80497de89bc00a15b03221739 (diff) | |
Revision Makefiles de labltk pour adaptation aux nouveaux .cma avec libs C integrees
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2948 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/lib')
| -rw-r--r-- | otherlibs/labltk/lib/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index 44cf343fb..29eea60f7 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -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) $(X11_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) $(X11_LINK) labltktop : $(TOPDEPS) $(WIDGETOBJS) $(SUPPORT) $(LABLC) -custom -linkall -o labltktop -I ../support $(TKLINKOPT) \ @@ -35,16 +37,12 @@ labltk: Makefile $(TOPDIR)/config/Makefile labltklink: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlc -custom -I $(LABLTKDIR) tk41.cma "$$@" \' >> $@ - @echo ' -cclib "-L$(LABLTKDIR) -llabltk41 $(TK_LINK)" \' >> $@ - @echo ' $(X11_LINK) -cclib "$(CCLIBS) $(DLLIB)"' >> $@ + @echo 'exec ocamlc -I $(LABLTKDIR) tk41.cma "$$@"' >> $@ labltkopt: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlopt -I $(LABLTKDIR) tk41.cmxa "$$@" \' >> $@ - @echo ' -cclib "-L$(LABLTKDIR) -llabltk41 $(TK_LINK)" \' >> $@ - @echo ' $(X11_LINK) -cclib "$(CCLIBS) $(DLLIB)"' >> $@ + @echo 'exec ocamlopt -I $(LABLTKDIR) tk41.cmxa "$$@" ' # All .{ml,mli} files are generated in this directory clean : |