Fix build issues with a minimal Scilab 6: 49/8149/2
Sylvestre Ledru [Wed, 18 Jul 2012 09:50:13 +0000 (11:50 +0200)]
./configure --enable-build-parser --without-gui --without-javasci --without-jdk --disable-build-help --disable-build-localization --without-scicos --without-xcos --without-ocaml --without-modelica --without-fftw --without-pvm --without-umfpack --without-tk --without-openmp

Change-Id: I1baa787abab4c2465a4b0ab236b49c42c556b010

scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in

index 2c4de77..0280405 100644 (file)
@@ -244,7 +244,10 @@ libscilab_la_LIBADD += $(NO_GUI_LIBS)
 endif
 
 # Core modules
-libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS) $(top_builddir)/modules/types/libscitypes-java.la $(top_builddir)/modules/libscilab-cli.la
+libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS)  $(top_builddir)/modules/libscilab-cli.la
+if GUI
+libscilab_la_LIBADD +=$(top_builddir)/modules/types/libscitypes-java.la
+endif
 
 ################## libscilab-cli  ##################
 
index 826aa0a..e21f3ee 100644 (file)
@@ -58,6 +58,7 @@ host_triplet = @host@
 @JAVASCI_TRUE@am__append_2 = javasci
 @GUI_TRUE@am__append_3 = $(GUI_LIBS)
 @GUI_FALSE@am__append_4 = $(NO_GUI_LIBS)
+@GUI_TRUE@am__append_5 = $(top_builddir)/modules/types/libscitypes-java.la
 subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -120,9 +121,8 @@ libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@
 libscilab_la_DEPENDENCIES = $(am__append_3) $(am__append_4) \
-       $(EXTERNAL_LIBS) \
-       $(top_builddir)/modules/types/libscitypes-java.la \
-       $(top_builddir)/modules/libscilab-cli.la
+       $(EXTERNAL_LIBS) $(top_builddir)/modules/libscilab-cli.la \
+       $(am__append_5)
 am_libscilab_la_OBJECTS =
 libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -589,9 +589,8 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 
 # Core modules
 libscilab_la_LIBADD = $(am__append_3) $(am__append_4) $(OTHER_LIBS) \
-       $(EXTERNAL_LIBS) \
-       $(top_builddir)/modules/types/libscitypes-java.la \
-       $(top_builddir)/modules/libscilab-cli.la
+       $(EXTERNAL_LIBS) $(top_builddir)/modules/libscilab-cli.la \
+       $(am__append_5)
 
 ################## libscilab-cli  ##################
 libscilab_cli_la_SOURCES = 
index dcf649f..b0b43b8 100644 (file)
@@ -26,7 +26,7 @@ libsciparallel_la_CFLAGS= $(OPENMP_CFLAGS) \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes \
 -I$(top_srcdir)/modules/operations/includes \
--I$(top_srcdir)/modules/operations/includes
+-I$(top_srcdir)/modules/localization/includes
 
 libsciparallel_la_CPPFLAGS= $(OPENMP_CXXFLAGS) \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
index 5b4423d..4a191b1 100644 (file)
@@ -432,7 +432,7 @@ libsciparallel_la_CFLAGS = $(OPENMP_CFLAGS) \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes \
 -I$(top_srcdir)/modules/operations/includes \
--I$(top_srcdir)/modules/operations/includes
+-I$(top_srcdir)/modules/localization/includes
 
 libsciparallel_la_CPPFLAGS = $(OPENMP_CXXFLAGS) \
 -I$(top_srcdir)/libs/MALLOC/includes/ \