Re-apply https://codereview.scilab.org/#/c/14091/ after recnet updates of compilation... 07/14207/1
Vincent COUVERT [Fri, 28 Mar 2014 12:43:48 +0000 (13:43 +0100)]
Change-Id: I5883ff46eeddf223caa7fab66d9df1551356dee5

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

index 6831557..b525aae 100644 (file)
@@ -38,8 +38,8 @@ if IS_MACOSX
 bin_SCRIPTS            += bin/checkmacosx.applescript
 endif
 
-scilab_bin_LDFLAGS     = $(AM_LDFLAGS)
-scilab_cli_bin_LDFLAGS  = $(AM_LDFLAGS)
+scilab_bin_LDFLAGS     = $(AM_LDFLAGS) $(XML_LIBS)
+scilab_cli_bin_LDFLAGS  = $(AM_LDFLAGS) $(XML_LIBS)
 
 if IS_MACOSX
 scilab_bin_LDFLAGS             += -framework Cocoa
index d1f054d..f2fc467 100644 (file)
@@ -794,8 +794,9 @@ 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_8)
-scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_9)
+scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(XML_LIBS) $(am__append_2) \
+       $(am__append_8)
+scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(XML_LIBS) $(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) \
index 245b3fc..2b545a7 100644 (file)
@@ -977,9 +977,9 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
-@JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \