diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2001-03-30 12:21:13 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2001-03-30 12:21:13 +0000 |
| commit | 6a97978504e9c774d6c3d589fa7f25e9dcc130e7 (patch) | |
| tree | feba270b94fbd6c78359106fd62f7546b8a88a6f | |
| parent | ad4f24ba12ef80a20eadc9ceed6be5740bfea801 (diff) | |
| download | ocaml-6a97978504e9c774d6c3d589fa7f25e9dcc130e7.tar.gz | |
Cleanup patches (see PR#321)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3478 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | asmrun/Makefile | 2 | ||||
| -rwxr-xr-x | config/auto-aux/config.guess | 1 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | lex/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/bigarray/Makefile | 4 | ||||
| -rw-r--r-- | otherlibs/systhreads/Makefile | 2 |
7 files changed, 9 insertions, 5 deletions
@@ -448,6 +448,7 @@ runtime: clean:: cd byterun; $(MAKE) clean rm -f stdlib/libcamlrun.a + rm -f stdlib/caml alldepend:: cd byterun; $(MAKE) depend diff --git a/asmrun/Makefile b/asmrun/Makefile index c9ae28d007..eb27d3e62b 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -136,7 +136,7 @@ meta.c: ../byterun/meta.c LINKEDFILES=misc.c freelist.c major_gc.c minor_gc.c memory.c alloc.c array.c \ compare.c ints.c floats.c str.c io.c extern.c intern.c hash.c sys.c \ parsing.c gc_ctrl.c terminfo.c md5.c obj.c lexing.c printexc.c callback.c \ - weak.c compact.c finalise.c meta.c + weak.c compact.c finalise.c meta.c custom.c main.c clean:: rm -f $(LINKEDFILES) diff --git a/config/auto-aux/config.guess b/config/auto-aux/config.guess index c2d43748a4..5c2be238ef 100755 --- a/config/auto-aux/config.guess +++ b/config/auto-aux/config.guess @@ -354,6 +354,7 @@ EOF elif test "${UNAME_MACHINE}" = "osfmach3_ppc" ; then echo powerpc-unknown-linux ; exit 0 elif test "${UNAME_MACHINE}" = "sa110" || + test "${UNAME_MACHINE}" = "armv3l" || test "${UNAME_MACHINE}" = "armv4l" ; then echo arm-unknown-linux ; exit 0 else @@ -883,6 +883,8 @@ for dir in /usr/include /usr/include/gdbm /usr/include/db1; do dbm_link="" elif sh ./hasgot -lndbm dbm_open; then dbm_link="-cclib -lndbm" + elif sh ./hasgot -ldb1 dbm_open; then + dbm_link="-cclib -ldb1" else dbm_include="not found" fi diff --git a/lex/Makefile b/lex/Makefile index 1e713cefc2..277ac4afce 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -37,7 +37,7 @@ ocamllex.opt: $(OBJS:.cmo=.cmx) clean:: rm -f ocamllex ocamllex.opt - rm -f *.cmo *.cmi + rm -f *.cmo *.cmi *.cmx *.o parser.ml parser.mli: parser.mly $(CAMLYACC) $(YACCFLAGS) parser.mly diff --git a/otherlibs/bigarray/Makefile b/otherlibs/bigarray/Makefile index 357a890f52..50f4ce1562 100644 --- a/otherlibs/bigarray/Makefile +++ b/otherlibs/bigarray/Makefile @@ -50,10 +50,10 @@ installopt: cd $(LIBDIR); $(RANLIB) bigarray.a partialclean: - rm -f *.cm* + rm -f *.cm* clean: partialclean - rm -f libbigarray.a *.o + rm -f libbigarray.a *.o bigarray.a .SUFFIXES: .ml .mli .cmo .cmi .cmx diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile index def488a636..f0f973a0db 100644 --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile @@ -61,7 +61,7 @@ partialclean: rm -f *.cm* clean: partialclean - rm -f libthreads*.a *.o + rm -f libthreads*.a *.o threads.a rm -f $(GENFILES) install: |