Merge remote branch 'origin/master' into MPI

[scilab.git] / scilab / modules / core / Makefile.in

diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 9ca2834..6e11c43 100644 (file)
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -82,11 +82,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -488,6 +489,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -501,6 +503,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@