Merge remote-tracking branch 'origin/master' into MPI 56/9356/1
Sylvestre Ledru [Tue, 2 Oct 2012 13:50:15 +0000 (15:50 +0200)]
Change-Id: I990df260f42b7f782b0f4df0ea79c23a117be16c

1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/fftw/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/xcos/Makefile.in

Simple merge
@@@ -632,11 -628,11 +632,11 @@@ AM_CFLAGS = $(SCI_CFLAGS
  AM_CXXFLAGS = $(SCI_CXXFLAGS)
  AM_FFLAGS = $(SCI_FFLAGS)
  AM_LDFLAGS = $(SCI_LDFLAGS)
- changelogs = CHANGES CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X CHANGES_5.4.X
+ changelogs = CHANGES CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X CHANGES_5.4.X  CHANGES_5.5.X
  bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
        $(am__append_1)
 -scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
 -scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS)
 +scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_2)
 +scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS)
  scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
                      -I$(top_srcdir)/modules/console/includes/ \
                      -I$(top_srcdir)/modules/localization/includes/ \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge