diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-12-17 09:58:47 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-12-17 09:58:47 +0000 |
| commit | c81cc506ecc364b1460a0240541e23e945fae9ac (patch) | |
| tree | a7f29d790abfddf854456407abd707d5c5eee433 | |
| parent | ed52c665b6608f1a5a689ddfd8d23fb12a731332 (diff) | |
| download | ocaml-c81cc506ecc364b1460a0240541e23e945fae9ac.tar.gz | |
configure: SO must be "so" or "dll" without the dot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14369 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | .ignore | 8 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | boot/.ignore | 2 | ||||
| -rw-r--r-- | config/.ignore | 1 | ||||
| -rwxr-xr-x | configure | 6 |
5 files changed, 10 insertions, 16 deletions
@@ -8,12 +8,4 @@ ocamlopt.opt ocamlcomp.sh ocamlcompopt.sh package-macosx -_boot_log1 -_boot_log2 -_build -_start -_buildtest -_log -myocamlbuild_config.ml -ocamlbuild-mixed-boot ocamlnat @@ -829,8 +829,13 @@ depend: beforedepend alldepend:: depend distclean: - ./build/distclean.sh - rm -f ocaml ocamlcomp.sh testsuite/_log + $(MAKE) clean + rm -f boot/ocamlrun boot/ocamlrun.exe boot/camlheader boot/ocamlyacc \ + boot/*.cm* boot/libcamlrun.a + rm -f config/Makefile config/m.h config/s.h + rm -f tools/*.bak tools/ocamlmklibconfig.ml + rm -f ocaml ocamlc ocamlcomp.sh + rm -f testsuite/_log .PHONY: all backup bootstrap checkstack clean .PHONY: partialclean beforedepend alldepend cleanboot coldstart diff --git a/boot/.ignore b/boot/.ignore index 8165156d9a..30c5866b7c 100644 --- a/boot/.ignore +++ b/boot/.ignore @@ -4,5 +4,3 @@ ocamlrun.exe ocamlyacc ocamlyacc.exe camlheader -myocamlbuild -myocamlbuild.native diff --git a/config/.ignore b/config/.ignore index 9fc1c014fc..259ce3f6e3 100644 --- a/config/.ignore +++ b/config/.ignore @@ -1,4 +1,3 @@ m.h s.h Makefile -config.sh @@ -309,7 +309,7 @@ dllccompopts="" ostype="Unix" exe="" iflexdir="" -SO=".so" +SO="so" TOOLCHAIN="cc" case "$bytecc,$target" in @@ -409,7 +409,7 @@ case "$bytecc,$target" in exe=".exe" ostype="Win32" TOOLCHAIN="mingw" - SO=".dll" + SO="dll" ;; *gcc*,x86_64-*-linux*) bytecccompopts="-fno-defer-pop $gcc_warnings" @@ -1696,7 +1696,7 @@ echo "SO=$SO" >> Makefile echo "EXT_OBJ=.o" >> Makefile echo "EXT_ASM=.s" >> Makefile echo "EXT_LIB=.a" >> Makefile -echo "EXT_DLL=$SO" >> Makefile +echo "EXT_DLL=.$SO" >> Makefile echo "EXTRALIBS=" >> Makefile echo "CCOMPTYPE=cc" >> Makefile echo "TOOLCHAIN=$TOOLCHAIN" >> Makefile |