When not building with java, disable external_objects_java

Change-Id: I871c6574ed5b1c14e36401a4017e74d58aac0a8f

diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index d8c9c37..566bd4c 100644 (file)
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -89,9 +89,11 @@ history_browser \
 preferences \
 xml \
 types \
-external_objects \
-external_objects_java
+external_objects
 
+if GUI
+SUBDIRS += external_objects_java
+endif
 
 if XCOS
 SUBDIRS += scicos_blocks
@@ -136,7 +138,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
-       $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la 
+       $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la
 
 NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \

diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 92cee25..f536487 100644 (file)
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -95,21 +95,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@XCOS_TRUE@am__append_1 = scicos_blocks
-@MPI_TRUE@am__append_2 = mpi
+@GUI_TRUE@am__append_1 = external_objects_java
+@XCOS_TRUE@am__append_2 = scicos_blocks
+@MPI_TRUE@am__append_3 = mpi
 
 # javasci should be compile at the end because it needs libscilab.la
 # Don't forget that the order in subdirs does matter !!!
-@JAVASCI_TRUE@am__append_3 = javasci
-@MPI_TRUE@am__append_4 = $(top_builddir)/modules/mpi/libscimpi.la
-@GUI_TRUE@am__append_5 = $(GUI_LIBS)   $(top_builddir)/modules/types/libscitypes.la
-@GUI_FALSE@am__append_6 = $(NO_GUI_LIBS)
+@JAVASCI_TRUE@am__append_4 = javasci
+@MPI_TRUE@am__append_5 = $(top_builddir)/modules/mpi/libscimpi.la
+@GUI_TRUE@am__append_6 = $(GUI_LIBS)   $(top_builddir)/modules/types/libscitypes.la
+@GUI_FALSE@am__append_7 = $(NO_GUI_LIBS)
 
 # This should never be used in production. It forces the explicit link
 # between libscilab and some "on-the-fly" loaded libraries.
 # It has been added to make sure that the full link is correctly done
 # and all symbols resolved.
-@FORCE_LINK_TRUE@am__append_7 = $(ENGINE_LIBS_DYNAMIC_LOAD)
+@FORCE_LINK_TRUE@am__append_8 = $(ENGINE_LIBS_DYNAMIC_LOAD)
 subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/config/mkinstalldirs
@@ -177,8 +178,8 @@ libscilab_cli_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) \
        -o $@
-libscilab_la_DEPENDENCIES = $(am__append_5) $(am__append_6) \
-       $(am__append_7) $(top_builddir)/modules/libscilab-cli.la
+libscilab_la_DEPENDENCIES = $(am__append_6) $(am__append_7) \
+       $(am__append_8) $(top_builddir)/modules/libscilab-cli.la
 am_libscilab_la_OBJECTS =
 libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 libscilab_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -578,8 +579,8 @@ SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
        compatibility_functions helptools umfpack demo_tools \
        genetic_algorithms simulated_annealing matio atoms hdf5 graph \
        xcos scinotes parallel modules_manager ui_data history_browser \
-       preferences xml types external_objects external_objects_java \
-       $(am__append_1) scicos $(am__append_2) . $(am__append_3)
+       preferences xml types external_objects $(am__append_1) \
+       $(am__append_2) scicos $(am__append_3) . $(am__append_4)
 
 #### Basic files ####
 libscilab_la_rootdir = $(mydatadir)
@@ -603,7 +604,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
-       $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la 
+       $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la
 
 NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
@@ -652,7 +653,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/xml/libscixml.la \
        $(top_builddir)/modules/external_objects/libsciexternal_objects.la \
        $(top_builddir)/modules/preferences/libscipreferences-cli.la \
-       $(am__append_4)
+       $(am__append_5)
 
 # These libraries are loaded dynamically from Scilab.
 ENGINE_LIBS_DYNAMIC_LOAD = \
@@ -676,8 +677,8 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 # Core modules
 
 # Core modules
-libscilab_la_LIBADD = $(am__append_5) $(am__append_6) $(OTHER_LIBS) \
-       $(EXTERNAL_LIBS) $(am__append_7) \
+libscilab_la_LIBADD = $(am__append_6) $(am__append_7) $(OTHER_LIBS) \
+       $(EXTERNAL_LIBS) $(am__append_8) \
        $(top_builddir)/modules/libscilab-cli.la
 
 ################## libscilab-cli  ##################