* Bug 16033 fixed: now scilab-bin is not built using --without-gui 15/20915/3
St├ęphane Mottelet [Mon, 1 Apr 2019 11:57:39 +0000 (13:57 +0200)]
https://bugzilla.scilab.org/show_bug.cgi?id=16033

Change-Id: I8df2799a13ed173e463d409852683a945f0e84ff

scilab/Makefile.am
scilab/Makefile.in
scilab/modules/javasci/Makefile.in

index 42e0157..5df08bf 100644 (file)
@@ -30,11 +30,13 @@ AM_CXXFLAGS = $(SCI_CXXFLAGS)
 AM_FFLAGS   = $(SCI_FFLAGS)
 AM_LDFLAGS  = $(SCI_LDFLAGS)
 
+if GUI
 bin_PROGRAMS           = scilab-bin scilab-cli-bin
-
-bin_SCRIPTS                    = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
-bin/scinotes bin/xcos
-
+bin_SCRIPTS            = bin/scilab bin/scilab-adv-cli bin/scilab-cli bin/scinotes bin/xcos
+else
+bin_PROGRAMS           = scilab-cli-bin
+bin_SCRIPTS            = bin/scilab-cli
+endif
 if IS_MACOSX
 bin_SCRIPTS            += bin/checkmacosx.applescript
 endif
index 0971170..7f036cc 100644 (file)
@@ -119,7 +119,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
+@GUI_FALSE@bin_PROGRAMS = scilab-cli-bin$(EXEEXT)
+@GUI_TRUE@bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
 @IS_MACOSX_TRUE@am__append_1 = bin/checkmacosx.applescript
 
 #
@@ -835,8 +836,9 @@ AM_CFLAGS = $(SCI_CFLAGS)
 AM_CXXFLAGS = $(SCI_CXXFLAGS)
 AM_FFLAGS = $(SCI_FFLAGS)
 AM_LDFLAGS = $(SCI_LDFLAGS)
-bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
-       bin/scinotes bin/xcos $(am__append_1)
+@GUI_FALSE@bin_SCRIPTS = bin/scilab-cli $(am__append_1)
+@GUI_TRUE@bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
+@GUI_TRUE@     bin/scinotes bin/xcos $(am__append_1)
 scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_2) \
        $(am__append_4) $(am__append_6)
 scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_3) \
index 6f9172e..7d39e98 100644 (file)
@@ -1023,10 +1023,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@JAVASCI_FALSE@clean-local:
+@JAVASCI_FALSE@distclean-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@install-data-local:
-@JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \