diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2000-04-16 14:36:44 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2000-04-16 14:36:44 +0000 |
| commit | 30e6eeed2c36f5893e6fb6c98ac8b3c10302e7df (patch) | |
| tree | 6a111dc712248652179b55a6c2e59e75562cade9 | |
| parent | af921a24ae23ad4a515e7419885f97271307399f (diff) | |
Suppression options -L inutiles
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3094 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | debugger/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile | 4 | ||||
| -rw-r--r-- | otherlibs/threads/Tests/Makefile | 1 | ||||
| -rw-r--r-- | test/Moretest/Makefile | 18 |
4 files changed, 7 insertions, 18 deletions
diff --git a/debugger/Makefile b/debugger/Makefile index 690d50061..338d473d4 100644 --- a/debugger/Makefile +++ b/debugger/Makefile @@ -16,7 +16,7 @@ include ../config/Makefile CAMLC=../boot/ocamlrun ../ocamlc -I ../boot COMPFLAGS=$(INCLUDES) -LINKFLAGS=-linkall -ccopt -L../otherlibs/unix +LINKFLAGS=-linkall -I ../otherlibs/unix CAMLYACC=../boot/ocamlyacc YACCFLAGS= CAMLLEX=../boot/ocamlrun ../boot/ocamllex diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index 219034748..9a710afc7 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -28,8 +28,8 @@ labltk.cmxa : $(SUPPORTX) $(WIDGETOBJSX) tk.cmx labltktop : $(TOPDEPS) $(WIDGETOBJS) $(SUPPORT) $(LABLC) -custom -linkall -o labltktop -I ../support $(TKLINKOPT) \ -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 \ + -I $(OTHERS)/unix unix.cma \ + -I $(OTHERS)/str str.cma \ topmain.cmo labltk: Makefile $(TOPDIR)/config/Makefile diff --git a/otherlibs/threads/Tests/Makefile b/otherlibs/threads/Tests/Makefile index b0a0f3b9c..f231daf77 100644 --- a/otherlibs/threads/Tests/Makefile +++ b/otherlibs/threads/Tests/Makefile @@ -18,7 +18,6 @@ PROGS=test1.byt test2.byt test3.byt test4.byt test5.byt test6.byt \ testsieve.byt token1.byt token2.byt CAMLC=../../../boot/ocamlrun ../../../ocamlc -I .. -I ../../../stdlib -I ../../unix -LIBS=-ccopt -L.. -ccopt -L../../unix -ccopt -L../../graphics include ../../../config/Makefile diff --git a/test/Moretest/Makefile b/test/Moretest/Makefile index ecc894708..d0a55b823 100644 --- a/test/Moretest/Makefile +++ b/test/Moretest/Makefile @@ -50,18 +50,14 @@ bigarrays.byt: ../../otherlibs/bigarray/bigarray.cma \ $(CAMLC) -o bigarrays.byt \ -I ../../otherlibs/bigarray \ -I ../../otherlibs/unix \ - unix.cma bigarray.cma bigarrays.ml \ - -ccopt -L../../otherlibs/bigarray \ - -ccopt -L../../otherlibs/unix + unix.cma bigarray.cma bigarrays.ml bigarrays.out: ../../otherlibs/bigarray/bigarray.cmxa \ ../../otherlibs/bigarray/libbigarray.a bigarrays.ml $(CAMLOPT) $(OPTFLAGS) -o bigarrays.out \ -I ../../otherlibs/bigarray \ -I ../../otherlibs/unix \ - unix.cmxa bigarray.cmxa bigarrays.ml \ - -ccopt -L../../otherlibs/bigarray \ - -ccopt -L../../otherlibs/unix + unix.cmxa bigarray.cmxa bigarrays.ml bigarrf.byt: bigarrf.o bigarrfstub.o \ ../../otherlibs/bigarray/bigarray.cma \ @@ -71,8 +67,6 @@ bigarrf.byt: bigarrf.o bigarrfstub.o \ -I ../../otherlibs/unix \ unix.cma bigarray.cma bigarrf.ml \ bigarrf.o bigarrfstub.o \ - -ccopt -L../../otherlibs/bigarray \ - -ccopt -L../../otherlibs/unix \ ../../byterun/libcamlrun.a -cclib -lg2c bigarrf.out: bigarrf.o bigarrfstub.o \ @@ -83,8 +77,6 @@ bigarrf.out: bigarrf.o bigarrfstub.o \ -I ../../otherlibs/unix \ unix.cma bigarray.cma bigarrf.ml \ bigarrf.o bigarrfstub.o \ - -ccopt -L../../otherlibs/bigarray \ - -ccopt -L../../otherlibs/unix \ ../../byterun/libcamlrun.a -cclib -lg2c bigarrf.o: bigarrf.f @@ -95,13 +87,11 @@ bigarrfstub.o: bigarrfstub.c fftba.byt: fftba.ml $(CAMLC) -o fftba.byt -I ../../otherlibs/bigarray \ - bigarray.cma fftba.ml \ - -ccopt -L../../otherlibs/bigarray + bigarray.cma fftba.ml fftba.out: fftba.ml $(CAMLOPT) $(OPTFLAGS) -o fftba.out -I ../../otherlibs/bigarray \ - bigarray.cmxa fftba.ml \ - -ccopt -L../../otherlibs/bigarray + bigarray.cmxa fftba.ml # Common rules |