diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1995-11-26 20:23:16 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1995-11-26 20:23:16 +0000 |
| commit | c4913b91fb1b152601a047f2163a8fe758a9042a (patch) | |
| tree | e36a1ae6701db075c5bb7cb4861b22fa290d2318 | |
| parent | feac66d0ed9f594951f018dbacab148771f446e1 (diff) | |
Nettoyage
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@471 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | otherlibs/num/Makefile | 4 | ||||
| -rw-r--r-- | otherlibs/num/test/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/str/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/unix/Makefile | 2 | ||||
| -rw-r--r-- | stdlib/Makefile | 2 |
5 files changed, 10 insertions, 2 deletions
diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile index 41c12df78..5d56591f8 100644 --- a/otherlibs/num/Makefile +++ b/otherlibs/num/Makefile @@ -24,7 +24,7 @@ nums.cma: $(CAMLOBJS) nums.cmxa: $(CAMLOBJS:.cmo=.cmx) $(CAMLOPT) -a -o nums.cmxa $(CAMLOBJS:.cmo=.cmx) - + libnums.a: bignum/libbignum.a $(COBJS) cp bignum/libbignum.a libnums.a ar r libnums.a $(COBJS) @@ -33,6 +33,8 @@ libnums.a: bignum/libbignum.a $(COBJS) bignum/libbignum.a: cd bignum; make $(BIGNUM_ARCH) CC="$(CC)" +$(CAMLOBJS:.cmo=.cmx): ../../cslopt + install: cp libnums.a $(LIBDIR)/libnums.a cd $(LIBDIR); $(RANLIB) libnums.a diff --git a/otherlibs/num/test/Makefile b/otherlibs/num/test/Makefile index b6723b5cd..516d53dc1 100644 --- a/otherlibs/num/test/Makefile +++ b/otherlibs/num/test/Makefile @@ -16,6 +16,8 @@ test.byt: $(TESTFILES) ../nums.cma ../libnums.a test.opt: $(TESTOPTFILES) ../nums.cmxa ../libnums.a $(CAMLOPT) -o test.opt ../nums.cmxa $(TESTOPTFILES) ../libnums.a +$(TESTOPTFILES): ../../../cslopt + .SUFFIXES: .ml .cmo .cmx .ml.cmo: diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile index d21a1dac9..39e4e04be 100644 --- a/otherlibs/str/Makefile +++ b/otherlibs/str/Makefile @@ -28,6 +28,8 @@ str.cmxa: str.cmx $(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h cd $(REGEXLIB); CC="$(CC)" sh configure; $(MAKE) +str.cmx: ../../cslopt + clean: rm -f *.cm* diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile index cd18c1141..7a389c590 100644 --- a/otherlibs/unix/Makefile +++ b/otherlibs/unix/Makefile @@ -38,6 +38,8 @@ unix.cma: unix.cmo unix.cmxa: unix.cmx $(CAMLOPT) -a -o unix.cmxa unix.cmx +unix.cmx: ../../cslopt + clean: rm -f *.cm* diff --git a/stdlib/Makefile b/stdlib/Makefile index 7acce3d62..2c87b689b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -64,7 +64,7 @@ $(OBJS:.cmo=.cmi): $(COMPILER) $(OBJS:.cmo=.cmx): $(OPTCOMPILER) clean: - rm -f *.cm* + rm -f *.cm* *.o *.a rm -f cslheader rm -f *~ |