Fix Scilab minimal compilation after:
[scilab.git] / scilab / Makefile.in
index 0f508de..d1f054d 100644 (file)
@@ -106,22 +106,23 @@ host_triplet = @host@
 bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
 @IS_MACOSX_TRUE@am__append_1 = bin/checkmacosx.applescript
 @IS_MACOSX_TRUE@am__append_2 = -framework Cocoa
-@MPI_TRUE@am__append_3 = modules/startup/src/c/initMPI.c
-@MPI_TRUE@am__append_4 = $(OPENMPI_CXXFLAGS)
-@MPI_TRUE@am__append_5 = modules/startup/src/c/initMPI.c
-@MPI_TRUE@am__append_6 = $(OPENMPI_CXXFLAGS)
-@USE_STATIC_SYSTEM_LIB_TRUE@am__append_7 = -static-libstdc++ -static-libgcc
-# -static-libgfortran
+@NEED_JAVA_TRUE@am__append_3 = $(top_builddir)/modules/jvm/libscijvm.la
+@MPI_TRUE@am__append_4 = modules/startup/src/c/initMPI.c
+@MPI_TRUE@am__append_5 = $(OPENMPI_CXXFLAGS)
+@MPI_TRUE@am__append_6 = modules/startup/src/c/initMPI.c
+@MPI_TRUE@am__append_7 = $(OPENMPI_CXXFLAGS)
 @USE_STATIC_SYSTEM_LIB_TRUE@am__append_8 = -static-libstdc++ -static-libgcc
+# -static-libgfortran
+@USE_STATIC_SYSTEM_LIB_TRUE@am__append_9 = -static-libstdc++ -static-libgcc
 #-static-libgfortran
 # Clang (for example) needs an explicit reference to the lib
-@USE_STATIC_SYSTEM_LIB_FALSE@am__append_9 = -lstdc++
-# -static-libgfortran
 @USE_STATIC_SYSTEM_LIB_FALSE@am__append_10 = -lstdc++
+# -static-libgfortran
+@USE_STATIC_SYSTEM_LIB_FALSE@am__append_11 = -lstdc++
 
 #  The user wants to compile the localization files
-@GENERATE_LOCALIZATION_FILES_TRUE@am__append_11 = localization
-@COMPILATION_TESTS_TRUE@am__append_12 = check-java
+@GENERATE_LOCALIZATION_FILES_TRUE@am__append_12 = localization
+@COMPILATION_TESTS_TRUE@am__append_13 = check-java
 DIST_COMMON = $(top_srcdir)/Makefile.call_scilab.am \
        $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
@@ -269,9 +270,9 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
-       $(top_builddir)/modules/jvm/libscijvm.la $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) $(am__append_3) \
+       $(am__DEPENDENCIES_1)
 scilab_bin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
@@ -793,25 +794,25 @@ AM_LDFLAGS = $(SCI_LDFLAGS)
 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 \
        bin/scinotes bin/xcos $(am__append_1)
-scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) $(am__append_7)
-scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_8)
+scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_2) $(am__append_8)
+scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_9)
 scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
        -I$(top_srcdir)/modules/console/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ $(AM_CPPFLAGS) \
-       $(am__append_4)
+       $(am__append_5)
 # --no-undefined --relax
 
 # Localization dep already exists because of the `exportLocaleToSystem' symbol
 # (causing issues on some platform)
 COMMON_LIBS = $(LTLIBINTL)
 scilab_bin_SOURCES = modules/startup/src/c/mainscic.cpp \
-       $(am__append_3)
+       $(am__append_4)
 
 # Match scilab -nwni (ie command line without graphics)
 scilab_cli_bin_SOURCES = modules/startup/src/c/mainscic.cpp \
-       $(am__append_5)
-scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
        $(am__append_6)
+scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
+       $(am__append_7)
 
 # the scilab-bin object file itself uses symbols from at least libscilab-cli.la,
 # libsciconsole-minimal.la and libscijvm-disable.la, so we have to link with these
@@ -819,15 +820,15 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
 scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
-       $(top_builddir)/modules/jvm/libscijvm.la $(OPENMPI_LIBS) \
-       $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) $(am__append_9)
+       $(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
+       $(am__append_3) $(am__append_10)
 scilab_cli_bin_LDADD = $(top_builddir)/modules/libscilab-cli.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
        $(top_builddir)/modules/jvm/libscijvm-disable.la \
        $(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
-       $(am__append_10)
+       $(am__append_11)
 LANG_DOMAIN = scilab
-TARGETS_ALL = macros $(am__append_11) $(am__append_12)
+TARGETS_ALL = macros $(am__append_12) $(am__append_13)
 
 # check is performed with scilab, so use the serial-tests on purpose
 TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f