diff --git a/byterun/Makefile b/byterun/Makefile index f0f739a11..9ee6a69d0 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -33,11 +33,11 @@ install:: ocamlrun$(EXE): libcamlrun.a prims.o $(MKEXE) $(BYTECCLINKOPTS) -o ocamlrun$(EXE) \ - prims.o libcamlrun.a $(BYTECCLIBS) + prims.o libcamlrun.a $(BYTECCLIBS) ocamlrund$(EXE): libcamlrund.a prims.o $(MKEXE) -g $(BYTECCLINKOPTS) -o ocamlrund$(EXE) \ - prims.o libcamlrund.a $(BYTECCLIBS) + prims.o libcamlrund.a $(BYTECCLIBS) libcamlrun.a: $(OBJS) ar rc libcamlrun.a $(OBJS) diff --git a/byterun/Makefile.common b/byterun/Makefile.common index 938d53bac..bac885f1c 100755 --- a/byterun/Makefile.common +++ b/byterun/Makefile.common @@ -41,8 +41,8 @@ all:: ocamlrun$(EXE) ld.conf libcamlrun.$(A) .PHONY: all ld.conf: ../config/Makefile - echo "$(STUBLIBDIR)" >ld.conf - echo "$(LIBDIR)" >>ld.conf + echo "$(STUBLIBDIR)" > ld.conf + echo "$(LIBDIR)" >> ld.conf install:: cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE) @@ -50,8 +50,8 @@ install:: cd $(LIBDIR); $(RANLIB) libcamlrun.$(A) if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi for i in $(PUBLIC_INCLUDES); do \ - sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \ - done + sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \ + done cp ld.conf $(LIBDIR)/ld.conf .PHONY: install @@ -84,10 +84,10 @@ jumptbl.h : instruct.h -e '/^}/q' instruct.h > jumptbl.h version.h : ../VERSION - echo "#define OCAML_VERSION \"`head -1 ../VERSION`\"" >version.h + echo "#define OCAML_VERSION \"`head -1 ../VERSION`\"" > version.h clean: - rm -f ocamlrun$(EXE) ocamlrund$(EXE) *.$(O) *.$(A) + rm -f ocamlrun$(EXE) ocamlrund$(EXE) *.$(O) *.$(A) *.$(SO) rm -f primitives prims.c opnames.h jumptbl.h ld.conf rm -f version.h .PHONY: clean diff --git a/configure b/configure index 98f2260f8..48b54c9cd 100755 --- a/configure +++ b/configure @@ -1535,6 +1535,7 @@ echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile echo "IFLEXDIR=$iflexdir" >> Makefile echo "O=o" >> Makefile echo "A=a" >> Makefile +echo "SO=so" >> Makefile echo "EXT_OBJ=.o" >> Makefile echo "EXT_ASM=.s" >> Makefile echo "EXT_LIB=.a" >> Makefile