Improve the order of declaration (the --enable-force-full-link option was breaking... 26/10726/2
Sylvestre Ledru [Thu, 7 Mar 2013 13:51:17 +0000 (14:51 +0100)]
Change-Id: I5f201db02cfa383b94019b87492eef16b99d190c

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

index 9c5d110..4b7a400 100644 (file)
@@ -210,8 +210,7 @@ libscilab_la_LIBADD += $(NO_GUI_LIBS)
 endif
 
 # Core modules
-libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS) \
-       $(top_builddir)/modules/libscilab-cli.la
+libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS)
 
 if FORCE_LINK
 # This should never be used in production. It forces the explicit link
@@ -221,6 +220,8 @@ if FORCE_LINK
 libscilab_la_LIBADD += $(ENGINE_LIBS_DYNAMIC_LOAD)
 endif
 
+libscilab_la_LIBADD += $(top_builddir)/modules/libscilab-cli.la
+
 ################## libscilab-cli  ##################
 
 libscilab_cli_la_SOURCES =
index 35d4c85..a8dc240 100644 (file)
@@ -142,7 +142,7 @@ 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) \
-       $(top_builddir)/modules/libscilab-cli.la $(am__append_5)
+       $(am__append_5) $(top_builddir)/modules/libscilab-cli.la
 am_libscilab_la_OBJECTS =
 libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -584,8 +584,8 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 
 # Core modules
 libscilab_la_LIBADD = $(am__append_3) $(am__append_4) $(OTHER_LIBS) \
-       $(EXTERNAL_LIBS) $(top_builddir)/modules/libscilab-cli.la \
-       $(am__append_5)
+       $(EXTERNAL_LIBS) $(am__append_5) \
+       $(top_builddir)/modules/libscilab-cli.la
 
 ################## libscilab-cli  ##################
 libscilab_cli_la_SOURCES =