diff --git a/.merlin b/.merlin index 548e65e..c5ed8ad 100644 --- a/.merlin +++ b/.merlin @@ -2,6 +2,7 @@ PKG str unix bigarray lacaml S . S Test S Nuclei +S Parallel S CI S Utils S Basis diff --git a/Makefile.include b/Makefile.include index 2642376..433efa0 100644 --- a/Makefile.include +++ b/Makefile.include @@ -7,8 +7,8 @@ OCAMLBUILD=ocamlbuild -j 0 -cflags $(ocamlcflags) -lflags $(ocamllflags) $(ocaml MLLFILES=$(wildcard */*.mll) $(wildcard *.mll) Utils/math_functions.c MLYFILES=$(wildcard */*.mly) $(wildcard *.mly) -MLFILES= $(wildcard */*.ml) $(wildcard *.ml) -MLIFILES=$(wildcard */*.mli) $(wildcard *.mli) +MLFILES= $(filter-out $(wildcard Parallel_*/*), $(wildcard */*.ml) $(wildcard *.ml) ) +MLIFILES=$(filter-out $(wildcard Parallel_*/*), $(wildcard */*.mli) $(wildcard *.mli) ) ALL_NATIVE=$(patsubst %.ml,%.native,$(wildcard run_*.ml)) ALL_BYTE=$(patsubst %.ml,%.byte,$(wildcard run_*.ml)) diff --git a/configure b/configure index b0502e6..d8bddaf 100755 --- a/configure +++ b/configure @@ -77,7 +77,7 @@ while : ; do shift;; -mpi|--mpi) mpi='-tag "package(mpi)"';; - -help|--help) + -h|-help|--help) help;; *) echo "Unknown option $1, try -help" @@ -87,7 +87,7 @@ while : ; do done rm -f Parallel -if [[ -n $mpi ]] ; then +if [ "x.$mpi" != "x." ] ; then ln -s Parallel_mpi Parallel else ln -s Parallel_serial Parallel