* Under GNU/Linux and Mac OS X, Scilab startup speed of scilab-cli and scilab-adv... 88/5388/3
Sylvestre Ledru [Sat, 12 Nov 2011 12:33:17 +0000 (13:33 +0100)]
* Under GNU/Linux and Mac OS X, engine libraries have been merged into a single
  libraries named libscilab-cli.so. This greatly improves the startup
  performances.
  Note that the --enable-maintainer-mode enables the previous behavior (simply
  the development process).

Change-Id: If22e86aba09a8149db596620532ae42688c447cc

69 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/libs/dynamiclibrary/Makefile.am
scilab/libs/dynamiclibrary/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in

index 29d97db..1d7fcc1 100644 (file)
@@ -436,6 +436,10 @@ Removed functions (previously declared as obsolete):
 Performance:
 ============
 
+* Under GNU/Linux and Mac OS X, Scilab startup speed of scilab-cli and
+  scilab-adv-cli have been improved by 15 to 20 % (see Compilation for more
+  information).
+
 * SSE is now enabled by default under GNU/Linux with 32 bit CPU (it is already
   the case under 64 bit CPU).
   Pentium III class (or equivalent) with SSE instructions is required.
@@ -451,6 +455,12 @@ Compilation:
 
 * Under Windows, Scilab uses VS 2010 Pro and Express solution.
 
+* Under GNU/Linux and Mac OS X, engine libraries have been merged into a single
+  libraries named libscilab-cli.so. This greatly improves the startup
+  performances.
+  Note that the --enable-maintainer-mode enables the previous behavior (simply
+  the development process).
+
 * Under GNU/Linux and Mac OS X, all modules build as standalone its algorithms
   as a static library (only available in the source tree).
   This will avoid an important dependency tree for unitary testing.
index fef2e54..9beb9d1 100644 (file)
@@ -30,8 +30,8 @@ if IS_MACOSX
 bin_SCRIPTS            += bin/checkmacosx.applescript
 endif
 
-scilab_bin_LDFLAGS             =
-scilab_cli_bin_LDFLAGS         =
+scilab_bin_LDFLAGS         =
+scilab_cli_bin_LDFLAGS  =
 
 if IS_MACOSX
 scilab_bin_LDFLAGS             += -framework Cocoa
@@ -54,13 +54,13 @@ SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli.la
 
 scilab_bin_SOURCES             = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 
-scilab_bin_LDADD               = $(COMMON_LIBS) $(SCILAB_LIB)
+scilab_bin_LDADD               = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
 
 # Match scilab -nwni (ie command line without graphics)
 scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 
 scilab_cli_bin_CFLAGS          = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
-scilab_cli_bin_LDADD           = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
+scilab_cli_bin_LDADD           = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
 
 
 if NEED_JAVA
index 85ad43a..eba64c4 100644 (file)
@@ -202,13 +202,15 @@ am__DEPENDENCIES_2 = $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/completion/libscicompletion.la \
        $(top_builddir)/modules/localization/libscilocalization.la \
        $(top_builddir)/modules/io/libsciio.la $(am__DEPENDENCIES_1)
-scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB)
+scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB) \
+       $(am__DEPENDENCIES_1)
 scilab_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_bin_CFLAGS) \
        $(CFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 am_scilab_cli_bin_OBJECTS = scilab_cli_bin-mainscic.$(OBJEXT)
 scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
-scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB)
+scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB) \
+       $(am__DEPENDENCIES_1)
 scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
        $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
@@ -603,12 +605,12 @@ $(LTLIBINTL)
 SCILAB_LIB = $(top_builddir)/modules/libscilab.la
 SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli.la
 scilab_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
-scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB)
+scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
 
 # Match scilab -nwni (ie command line without graphics)
 scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
-scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
+scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
 @ENABLE_STATIC_TRUE@scilab_static_bin_LDFLAGS = -static -static-libgcc --start-group
 @ENABLE_STATIC_TRUE@scilab_static_bin_CFLAGS = -Wl,--start-group `$(CXX) -print-file-name=libstdc++.a`
 @ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
index 76a727f..11e9e75 100644 (file)
@@ -12,7 +12,7 @@ includes/dynamiclibrary.h
 
 libscidynamiclibrary_la_CFLAGS= -Isrc/ -I$(srcdir)/includes/
 
-pkglib_LTLIBRARIES = libscidynamiclibrary.la
+noinst_LTLIBRARIES = libscidynamiclibrary.la
 
 libscidynamiclibrary_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 5442330..dc23f80 100644 (file)
@@ -84,30 +84,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libscidynamiclibrary_la_includedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
 libscidynamiclibrary_la_DEPENDENCIES =
 am__objects_1 = libscidynamiclibrary_la-dynamiclibrary_others.lo
 am_libscidynamiclibrary_la_OBJECTS = $(am__objects_1)
@@ -132,6 +109,28 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(libscidynamiclibrary_la_SOURCES)
 DIST_SOURCES = $(libscidynamiclibrary_la_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libscidynamiclibrary_la_includedir)"
 HEADERS = $(libscidynamiclibrary_la_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -390,7 +389,7 @@ libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
 
 libscidynamiclibrary_la_CFLAGS = -Isrc/ -I$(srcdir)/includes/
-pkglib_LTLIBRARIES = libscidynamiclibrary.la
+noinst_LTLIBRARIES = libscidynamiclibrary.la
 libscidynamiclibrary_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscidynamiclibrary_la_SOURCES = $(DYNAMICLIBRARY_C_SOURCES)
 
@@ -498,39 +497,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-       }
-
-uninstall-pkglibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-       done
 
-clean-pkglibLTLIBRARIES:
-       -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-       @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
          test "$$dir" != "$$p" || dir=.; \
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
 libscidynamiclibrary.la: $(libscidynamiclibrary_la_OBJECTS) $(libscidynamiclibrary_la_DEPENDENCIES) 
-       $(libscidynamiclibrary_la_LINK) -rpath $(pkglibdir) $(libscidynamiclibrary_la_OBJECTS) $(libscidynamiclibrary_la_LIBADD) $(LIBS)
+       $(libscidynamiclibrary_la_LINK)  $(libscidynamiclibrary_la_OBJECTS) $(libscidynamiclibrary_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -681,7 +658,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscidynamiclibrary_la_includedir)"; do \
+       for dir in "$(DESTDIR)$(libscidynamiclibrary_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -712,7 +689,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -739,7 +716,7 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-pkglibLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-am
 
@@ -779,14 +756,13 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libscidynamiclibrary_la_includeHEADERS \
-       uninstall-pkglibLTLIBRARIES
+uninstall-am: uninstall-libscidynamiclibrary_la_includeHEADERS
 
 .MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
+       clean-noinstLTLIBRARIES ctags distclean distclean-compile \
        distclean-generic distclean-libtool distclean-local \
        distclean-tags distdir dvi dvi-am html html-am info info-am \
        install install-am install-data install-data-am \
@@ -794,14 +770,12 @@ uninstall-am: uninstall-libscidynamiclibrary_la_includeHEADERS \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
        install-libscidynamiclibrary_la_includeHEADERS install-man \
-       install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am \
-       uninstall-libscidynamiclibrary_la_includeHEADERS \
-       uninstall-pkglibLTLIBRARIES
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       pdf pdf-am ps ps-am tags uninstall uninstall-am \
+       uninstall-libscidynamiclibrary_la_includeHEADERS
 
 
 # This target enables tests for Scilab
index 0f44fe1..3019407 100644 (file)
@@ -114,12 +114,12 @@ libscilab_la_rootdir = $(mydatadir)
 
 # libscilab is the full library with the GUI
 # libscilab-cli is for scilab-cli (without GUI)
-pkglib_LTLIBRARIES = libscilab.la libscilab-cli.la
+pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la 
 libscilab_la_SOURCES =
 libscilab_cli_la_SOURCES =
 
 libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
-libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
+libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
 
 EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
 $(top_builddir)/libs/MALLOC/libscimalloc.la  \
@@ -161,8 +161,10 @@ if HDF5
 NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
 # HDF5 is here because it needs the JVM (see bug #5481)
 endif
+
 ENGINE_LIBS =  $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/mexlib/libmex.la \
+       $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/parameters/libsciparameters.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
@@ -173,7 +175,6 @@ ENGINE_LIBS =       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
        $(top_builddir)/modules/double/libscidouble.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/integer/libsciinteger.la \
        $(top_builddir)/modules/intersci/libsciintersci.la \
        $(top_builddir)/modules/io/libsciio.la \
@@ -188,12 +189,11 @@ ENGINE_LIBS =     $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/xml/libscixml.la \
-        $(top_builddir)/modules/statistics/libscistatistics.la \
-        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+    $(top_builddir)/modules/statistics/libscistatistics.la \
+    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 
 # These libraries are loaded dynamically from Scilab.
@@ -216,16 +216,16 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 
 
 # Core modules
-libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
+libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
 
 if GUI
-libscilab_la_LIBADD += $(GUI_LIBS)
+libscilab_la_LIBADD = $(GUI_LIBS)
 else
-libscilab_la_LIBADD += $(NO_GUI_LIBS)
+libscilab_la_LIBADD = $(NO_GUI_LIBS)
 endif
 
 # Core modules
-libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
+libscilab_la_LIBADD += libscilab-cli.la $(OTHER_LIBS) $(EXTERNAL_LIBS)
 
 if ENABLE_STATIC
 libscilab_la_LIBADD += $(ALL_LIBS)
index 319495c..9eb0fc2 100644 (file)
@@ -64,9 +64,7 @@ host_triplet = @host@
 @JAVASCI_TRUE@am__append_2 = javasci
 @HDF5_TRUE@am__append_3 = $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
 @HDF5_TRUE@am__append_4 = $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
-@GUI_TRUE@am__append_5 = $(GUI_LIBS)
-@GUI_FALSE@am__append_6 = $(NO_GUI_LIBS)
-@ENABLE_STATIC_TRUE@am__append_7 = $(ALL_LIBS)
+@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS)
 subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -123,8 +121,10 @@ libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
-libscilab_la_DEPENDENCIES = $(ENGINE_LIBS) $(EXTERNAL_LIBS) \
-       $(am__append_5) $(am__append_6) $(am__DEPENDENCIES_1)
+@GUI_FALSE@libscilab_la_DEPENDENCIES = $(NO_GUI_LIBS) libscilab-cli.la \
+@GUI_FALSE@    $(EXTERNAL_LIBS) $(am__DEPENDENCIES_1)
+@GUI_TRUE@libscilab_la_DEPENDENCIES = $(GUI_LIBS) libscilab-cli.la \
+@GUI_TRUE@     $(EXTERNAL_LIBS) $(am__DEPENDENCIES_1)
 am_libscilab_la_OBJECTS =
 libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -465,11 +465,11 @@ libscilab_la_rootdir = $(mydatadir)
 
 # libscilab is the full library with the GUI
 # libscilab-cli is for scilab-cli (without GUI)
-pkglib_LTLIBRARIES = libscilab.la libscilab-cli.la
+pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la 
 libscilab_la_SOURCES = 
 libscilab_cli_la_SOURCES = 
 libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
-libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
+libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
 EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
 $(top_builddir)/libs/MALLOC/libscimalloc.la  \
 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
@@ -503,6 +503,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
 # HDF5 is here because it needs the JVM (see bug #5481)
 ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/mexlib/libmex.la \
+       $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/parameters/libsciparameters.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
@@ -513,7 +514,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
        $(top_builddir)/modules/double/libscidouble.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/integer/libsciinteger.la \
        $(top_builddir)/modules/intersci/libsciintersci.la \
        $(top_builddir)/modules/io/libsciio.la \
@@ -528,12 +528,11 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/functions/libscifunctions.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/xml/libscixml.la \
-        $(top_builddir)/modules/statistics/libscistatistics.la \
-        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+    $(top_builddir)/modules/statistics/libscistatistics.la \
+    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 
 
@@ -557,11 +556,15 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 
 
 # Core modules
-libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) \
-       $(am__append_5) $(am__append_6) $(am__append_7)
+libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
+
+# Core modules
+@GUI_FALSE@libscilab_la_LIBADD = $(NO_GUI_LIBS) libscilab-cli.la \
+@GUI_FALSE@    $(OTHER_LIBS) $(EXTERNAL_LIBS) $(am__append_5)
 
 # Core modules
-libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
+@GUI_TRUE@libscilab_la_LIBADD = $(GUI_LIBS) libscilab-cli.la \
+@GUI_TRUE@     $(OTHER_LIBS) $(EXTERNAL_LIBS) $(am__append_5)
 all: all-recursive
 
 .SUFFIXES:
index e708aaa..9c4d7c3 100644 (file)
@@ -38,7 +38,12 @@ libsciapi_scilab_la_CPPFLAGS=-I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/string/includes
 
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciapi_scilab.la
+else
+noinst_LTLIBRARIES = libsciapi_scilab.la
+endif
+
 
 libsciapi_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 29bdbe6..a81be42 100644 (file)
@@ -112,7 +112,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciapi_scilab_la_etcdir)" \
        "$(DESTDIR)$(libsciapi_scilab_la_rootdir)" \
        "$(DESTDIR)$(libsciapi_scilab_la_includedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciapi_scilab_la_DEPENDENCIES =
 am__objects_1 = libsciapi_scilab_la-api_boolean.lo \
        libsciapi_scilab_la-api_boolean_sparse.lo \
@@ -129,6 +129,9 @@ libsciapi_scilab_la_OBJECTS = $(am_libsciapi_scilab_la_OBJECTS)
 libsciapi_scilab_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libsciapi_scilab_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciapi_scilab_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciapi_scilab_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -428,7 +431,8 @@ libsciapi_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/string/includes
 
-pkglib_LTLIBRARIES = libsciapi_scilab.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciapi_scilab.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciapi_scilab.la
 libsciapi_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(API_SCILAB_CPP_SOURCES)
 
@@ -561,6 +565,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -593,7 +606,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciapi_scilab.la: $(libsciapi_scilab_la_OBJECTS) $(libsciapi_scilab_la_DEPENDENCIES) 
-       $(libsciapi_scilab_la_LINK) -rpath $(pkglibdir) $(libsciapi_scilab_la_OBJECTS) $(libsciapi_scilab_la_LIBADD) $(LIBS)
+       $(libsciapi_scilab_la_LINK) $(am_libsciapi_scilab_la_rpath) $(libsciapi_scilab_la_OBJECTS) $(libsciapi_scilab_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -895,7 +908,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -973,14 +986,14 @@ uninstall-am: uninstall-libsciapi_scilab_la_etcDATA \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libsciapi_scilab_la_etcDATA \
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libsciapi_scilab_la_etcDATA \
        install-libsciapi_scilab_la_includeHEADERS \
        install-libsciapi_scilab_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
index fe87048..fb5e77c 100644 (file)
@@ -25,8 +25,13 @@ libsciboolean_la_CFLAGS=     -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciboolean.la
 noinst_LTLIBRARIES = libsciboolean-algo.la
+else
+noinst_LTLIBRARIES = libsciboolean-algo.la libsciboolean.la
+endif
+
 
 libsciboolean_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index a8c3dea..1b5d151 100644 (file)
@@ -116,6 +116,8 @@ am__objects_1 = libsciboolean_algo_la-matboolean.lo \
 am__objects_2 = logic.lo find.lo
 am_libsciboolean_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciboolean_algo_la_OBJECTS = $(am_libsciboolean_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libsciboolean_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciboolean_algo_la_rpath =
 libsciboolean_la_DEPENDENCIES = libsciboolean-algo.la
 am__objects_3 = libsciboolean_la-sci_and.lo libsciboolean_la-sci_or.lo \
        libsciboolean_la-sci_find.lo libsciboolean_la-sci_bool2s.lo \
@@ -126,6 +128,8 @@ libsciboolean_la_OBJECTS = $(am_libsciboolean_la_OBJECTS)
 libsciboolean_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libsciboolean_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciboolean_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciboolean_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -423,8 +427,9 @@ libsciboolean_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libsciboolean.la
-noinst_LTLIBRARIES = libsciboolean-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciboolean.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciboolean-algo.la libsciboolean.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libsciboolean-algo.la
 libsciboolean_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libsciboolean_algo_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES)
 libsciboolean_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -585,9 +590,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciboolean-algo.la: $(libsciboolean_algo_la_OBJECTS) $(libsciboolean_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libsciboolean_algo_la_OBJECTS) $(libsciboolean_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libsciboolean_algo_la_rpath) $(libsciboolean_algo_la_OBJECTS) $(libsciboolean_algo_la_LIBADD) $(LIBS)
 libsciboolean.la: $(libsciboolean_la_OBJECTS) $(libsciboolean_la_DEPENDENCIES) 
-       $(libsciboolean_la_LINK) -rpath $(pkglibdir) $(libsciboolean_la_OBJECTS) $(libsciboolean_la_LIBADD) $(LIBS)
+       $(libsciboolean_la_LINK) $(am_libsciboolean_la_rpath) $(libsciboolean_la_OBJECTS) $(libsciboolean_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 14bd1d6..5ee1be3 100644 (file)
@@ -206,8 +206,13 @@ libscicacsd_la_CFLAGS=     -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscicacsd.la
 noinst_LTLIBRARIES = libscicacsd-algo.la
+else
+noinst_LTLIBRARIES = libscicacsd-algo.la libscicacsd.la
+endif
+
 
 libscicacsd_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)  $(ATLAS_LIBS)
 
index aa3a885..42ad2fc 100644 (file)
@@ -136,6 +136,8 @@ am__objects_2 = sb04pd.lo ib01ad.lo tb01wd.lo ib01py.lo mb01rx.lo \
        polmc.lo ssxmc.lo ZB03OD.lo riccpack.lo Ex-schur.lo
 am_libscicacsd_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscicacsd_algo_la_OBJECTS = $(am_libscicacsd_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscicacsd_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicacsd_algo_la_rpath =
 libscicacsd_la_DEPENDENCIES = libscicacsd-algo.la
 am__objects_3 = libscicacsd_la-sci_f_hinf.lo \
        libscicacsd_la-sci_f_zrankqr.lo libscicacsd_la-sci_f_tzer.lo \
@@ -165,6 +167,8 @@ libscicacsd_la_OBJECTS = $(am_libscicacsd_la_OBJECTS)
 libscicacsd_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(libscicacsd_la_FFLAGS) \
        $(FFLAGS) $(libscicacsd_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicacsd_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicacsd_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -641,8 +645,9 @@ libscicacsd_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
-pkglib_LTLIBRARIES = libscicacsd.la
-noinst_LTLIBRARIES = libscicacsd-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicacsd.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicacsd-algo.la libscicacsd.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicacsd-algo.la
 libscicacsd_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)  $(ATLAS_LIBS)
 libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES)
 libscicacsd_la_SOURCES = $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
@@ -805,9 +810,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscicacsd-algo.la: $(libscicacsd_algo_la_OBJECTS) $(libscicacsd_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscicacsd_algo_la_OBJECTS) $(libscicacsd_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscicacsd_algo_la_rpath) $(libscicacsd_algo_la_OBJECTS) $(libscicacsd_algo_la_LIBADD) $(LIBS)
 libscicacsd.la: $(libscicacsd_la_OBJECTS) $(libscicacsd_la_DEPENDENCIES) 
-       $(libscicacsd_la_LINK) -rpath $(pkglibdir) $(libscicacsd_la_OBJECTS) $(libscicacsd_la_LIBADD) $(LIBS)
+       $(libscicacsd_la_LINK) $(am_libscicacsd_la_rpath) $(libscicacsd_la_OBJECTS) $(libscicacsd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 2581297..aaf915b 100644 (file)
@@ -25,8 +25,13 @@ libscicall_scilab_la_CFLAGS=         -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes \
                        -I$(top_srcdir)/modules/core/src/c/
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscicall_scilab.la
 noinst_LTLIBRARIES = libscicall_scilab-algo.la
+else
+noinst_LTLIBRARIES = libscicall_scilab-algo.la libscicall_scilab.la
+endif
+
 
 libscicall_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index bb56730..24503ee 100644 (file)
@@ -124,6 +124,8 @@ libscicall_scilab_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscicall_scilab_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicall_scilab_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicall_scilab_algo_la_rpath =
 libscicall_scilab_la_DEPENDENCIES = libscicall_scilab-algo.la
 am__objects_2 = libscicall_scilab_la-sci_fromjava.lo \
        libscicall_scilab_la-sci_fromc.lo \
@@ -134,6 +136,9 @@ libscicall_scilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscicall_scilab_la_CFLAGS) $(CFLAGS) \
        $(libscicall_scilab_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicall_scilab_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicall_scilab_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -428,8 +433,9 @@ libscicall_scilab_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes \
                        -I$(top_srcdir)/modules/core/src/c/
 
-pkglib_LTLIBRARIES = libscicall_scilab.la
-noinst_LTLIBRARIES = libscicall_scilab-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicall_scilab.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicall_scilab-algo.la libscicall_scilab.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicall_scilab-algo.la
 libscicall_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscicall_scilab_algo_la_SOURCES = $(CALLSCILAB_C_SOURCES)
 libscicall_scilab_la_SOURCES = $(GATEWAY_C_SOURCES)
@@ -598,9 +604,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscicall_scilab-algo.la: $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_DEPENDENCIES) 
-       $(libscicall_scilab_algo_la_LINK)  $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_LIBADD) $(LIBS)
+       $(libscicall_scilab_algo_la_LINK) $(am_libscicall_scilab_algo_la_rpath) $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_LIBADD) $(LIBS)
 libscicall_scilab.la: $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_DEPENDENCIES) 
-       $(libscicall_scilab_la_LINK) -rpath $(pkglibdir) $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_LIBADD) $(LIBS)
+       $(libscicall_scilab_la_LINK) $(am_libscicall_scilab_la_rpath) $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index e4f64ea..561084e 100644 (file)
@@ -44,8 +44,13 @@ libscicompletion_la_CFLAGS=          $(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscicompletion.la
 noinst_LTLIBRARIES = libscicompletion-algo.la
+else
+noinst_LTLIBRARIES = libscicompletion-algo.la libscicompletion.la
+endif
+
 
 libscicompletion_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index b20a215..9c4155f 100644 (file)
@@ -145,6 +145,8 @@ libscicompletion_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscicompletion_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicompletion_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicompletion_algo_la_rpath =
 libscicompletion_la_DEPENDENCIES = libscicompletion-algo.la
 am__objects_3 = libscicompletion_la-sci_completion.lo \
        libscicompletion_la-gw_completion.lo
@@ -154,6 +156,9 @@ libscicompletion_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscicompletion_la_CFLAGS) $(CFLAGS) \
        $(libscicompletion_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicompletion_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicompletion_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -465,8 +470,9 @@ libscicompletion_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
-pkglib_LTLIBRARIES = libscicompletion.la
-noinst_LTLIBRARIES = libscicompletion-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicompletion.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicompletion-algo.la libscicompletion.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicompletion-algo.la
 libscicompletion_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libscicompletion.la
@@ -656,9 +662,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscicompletion-algo.la: $(libscicompletion_algo_la_OBJECTS) $(libscicompletion_algo_la_DEPENDENCIES) 
-       $(libscicompletion_algo_la_LINK)  $(libscicompletion_algo_la_OBJECTS) $(libscicompletion_algo_la_LIBADD) $(LIBS)
+       $(libscicompletion_algo_la_LINK) $(am_libscicompletion_algo_la_rpath) $(libscicompletion_algo_la_OBJECTS) $(libscicompletion_algo_la_LIBADD) $(LIBS)
 libscicompletion.la: $(libscicompletion_la_OBJECTS) $(libscicompletion_la_DEPENDENCIES) 
-       $(libscicompletion_la_LINK) -rpath $(pkglibdir) $(libscicompletion_la_OBJECTS) $(libscicompletion_la_LIBADD) $(LIBS)
+       $(libscicompletion_la_LINK) $(am_libscicompletion_la_rpath) $(libscicompletion_la_OBJECTS) $(libscicompletion_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 81232f7..d8a16fb 100644 (file)
@@ -307,10 +307,16 @@ libscicore_la_CFLAGS +=   $(TCL_INC_PATH) \
                                  $(TK_INC_PATH)
 endif
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscicore.la
 noinst_LTLIBRARIES = libscicore-algo.la
+else
+noinst_LTLIBRARIES = libscicore-algo.la libscicore.la
+endif
+
 
 libscicore_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(XML_LIBS)
+#-Wl,--version-script,LibScilab_Import.def
 
 # For the code check (splint)
 CHECK_SRC= $(CORE_C_SOURCES) $(GATEWAY_C_SOURCES)
index 2cb0704..5a675c9 100644 (file)
@@ -283,6 +283,8 @@ am__objects_5 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
 am_libscicore_algo_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
        $(am__objects_5)
 libscicore_algo_la_OBJECTS = $(am_libscicore_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscicore_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicore_algo_la_rpath =
 libscicore_la_DEPENDENCIES = libscicore-algo.la
 am__objects_6 = libscicore_la-sci_stacksize.lo \
        libscicore_la-sci_resume.lo libscicore_la-sci_mtlb_mode.lo \
@@ -325,6 +327,8 @@ libscicore_la_OBJECTS = $(am_libscicore_la_OBJECTS)
 libscicore_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscicore_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscicore_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscicore_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -786,9 +790,11 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/libs/MALLOC/includes/
 
-pkglib_LTLIBRARIES = libscicore.la
-noinst_LTLIBRARIES = libscicore-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicore.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicore-algo.la libscicore.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicore-algo.la
 libscicore_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(XML_LIBS)
+#-Wl,--version-script,LibScilab_Import.def
 
 # For the code check (splint)
 CHECK_SRC = $(CORE_C_SOURCES) $(GATEWAY_C_SOURCES)
@@ -992,9 +998,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscicore-algo.la: $(libscicore_algo_la_OBJECTS) $(libscicore_algo_la_DEPENDENCIES) 
-       $(CXXLINK)  $(libscicore_algo_la_OBJECTS) $(libscicore_algo_la_LIBADD) $(LIBS)
+       $(CXXLINK) $(am_libscicore_algo_la_rpath) $(libscicore_algo_la_OBJECTS) $(libscicore_algo_la_LIBADD) $(LIBS)
 libscicore.la: $(libscicore_la_OBJECTS) $(libscicore_la_DEPENDENCIES) 
-       $(libscicore_la_LINK) -rpath $(pkglibdir) $(libscicore_la_OBJECTS) $(libscicore_la_LIBADD) $(LIBS)
+       $(libscicore_la_LINK) $(am_libscicore_la_rpath) $(libscicore_la_OBJECTS) $(libscicore_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 5700a87..264e1a6 100644 (file)
@@ -49,11 +49,17 @@ libscidata_structures_la_CFLAGS=    -I$(srcdir)/includes/ \
 
 # Disable optimisation of the file intl_e.f
 noinst_LTLIBRARIES = libdummy-data_structures.la
+
 libdummy_data_structures_la_SOURCES = src/fortran/intl_e.f
 libdummy_data_structures_la_FFLAGS = $(FFLAGS:-O%=)
 
+
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscidata_structures.la
 noinst_LTLIBRARIES += libscidata_structures-algo.la
+else
+noinst_LTLIBRARIES += libscidata_structures-algo.la libscidata_structures.la
+endif
 
 libscidata_structures_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index dfe33c8..ee547d9 100644 (file)
@@ -56,9 +56,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@MAINTAINER_MODE_TRUE@am__append_1 = libscidata_structures-algo.la
+@MAINTAINER_MODE_FALSE@am__append_2 = libscidata_structures-algo.la libscidata_structures.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_1 = java
+@NEED_JAVA_TRUE@am__append_3 = java
 subdir = modules/data_structures
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -129,6 +131,8 @@ am_libscidata_structures_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscidata_structures_algo_la_OBJECTS =  \
        $(am_libscidata_structures_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscidata_structures_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidata_structures_algo_la_rpath =
 libscidata_structures_la_DEPENDENCIES = libscidata_structures-algo.la \
        libdummy-data_structures.la
 am__objects_3 = libscidata_structures_la-sci_lsslist.lo \
@@ -155,6 +159,9 @@ libscidata_structures_la_LINK = $(LIBTOOL) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
        $(AM_FFLAGS) $(FFLAGS) $(libscidata_structures_la_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscidata_structures_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidata_structures_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -480,11 +487,11 @@ libscidata_structures_la_CFLAGS = -I$(srcdir)/includes/ \
 
 
 # Disable optimisation of the file intl_e.f
-noinst_LTLIBRARIES = libdummy-data_structures.la \
-       libscidata_structures-algo.la
+noinst_LTLIBRARIES = libdummy-data_structures.la $(am__append_1) \
+       $(am__append_2)
 libdummy_data_structures_la_SOURCES = src/fortran/intl_e.f
 libdummy_data_structures_la_FFLAGS = $(FFLAGS:-O%=)
-pkglib_LTLIBRARIES = libscidata_structures.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidata_structures.la
 libscidata_structures_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscidata_structures_algo_la_SOURCES = $(DATA_STRUCTURES_C_SOURCES) $(DATA_STRUCTURES_FORTRAN_SOURCES)
 libscidata_structures_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -521,7 +528,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1)
+TARGETS_ALL = $(am__append_3)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -649,9 +656,9 @@ clean-pkglibLTLIBRARIES:
 libdummy-data_structures.la: $(libdummy_data_structures_la_OBJECTS) $(libdummy_data_structures_la_DEPENDENCIES) 
        $(libdummy_data_structures_la_LINK)  $(libdummy_data_structures_la_OBJECTS) $(libdummy_data_structures_la_LIBADD) $(LIBS)
 libscidata_structures-algo.la: $(libscidata_structures_algo_la_OBJECTS) $(libscidata_structures_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscidata_structures_algo_la_OBJECTS) $(libscidata_structures_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscidata_structures_algo_la_rpath) $(libscidata_structures_algo_la_OBJECTS) $(libscidata_structures_algo_la_LIBADD) $(LIBS)
 libscidata_structures.la: $(libscidata_structures_la_OBJECTS) $(libscidata_structures_la_DEPENDENCIES) 
-       $(libscidata_structures_la_LINK) -rpath $(pkglibdir) $(libscidata_structures_la_OBJECTS) $(libscidata_structures_la_LIBADD) $(LIBS)
+       $(libscidata_structures_la_LINK) $(am_libscidata_structures_la_rpath) $(libscidata_structures_la_OBJECTS) $(libscidata_structures_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index ac9ddc3..8169405 100644 (file)
@@ -133,8 +133,13 @@ libscidifferential_equations_la_CFLAGS=    -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/elementary_functions/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscidifferential_equations.la
 noinst_LTLIBRARIES = libscidifferential_equations-algo.la
+else
+noinst_LTLIBRARIES = libscidifferential_equations-algo.la libscidifferential_equations.la
+endif
+
 
 libscidifferential_equations_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index fb80eea..5994cbd 100644 (file)
@@ -137,6 +137,8 @@ am_libscidifferential_equations_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscidifferential_equations_algo_la_OBJECTS =  \
        $(am_libscidifferential_equations_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscidifferential_equations_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidifferential_equations_algo_la_rpath =
 libscidifferential_equations_la_DEPENDENCIES =  \
        libscidifferential_equations-algo.la
 am__objects_3 = libscidifferential_equations_la-sci_int2d.lo \
@@ -166,6 +168,9 @@ libscidifferential_equations_la_LINK = $(LIBTOOL) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
        $(AM_FFLAGS) $(FFLAGS) \
        $(libscidifferential_equations_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscidifferential_equations_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidifferential_equations_la_rpath =  \
+@MAINTAINER_MODE_TRUE@ -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -572,8 +577,9 @@ libscidifferential_equations_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/elementary_functions/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 
-pkglib_LTLIBRARIES = libscidifferential_equations.la
-noinst_LTLIBRARIES = libscidifferential_equations-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidifferential_equations.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscidifferential_equations-algo.la libscidifferential_equations.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscidifferential_equations-algo.la
 libscidifferential_equations_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscidifferential_equations_algo_la_SOURCES = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_FORTRAN_SOURCES)
 libscidifferential_equations_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -736,9 +742,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscidifferential_equations-algo.la: $(libscidifferential_equations_algo_la_OBJECTS) $(libscidifferential_equations_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscidifferential_equations_algo_la_OBJECTS) $(libscidifferential_equations_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscidifferential_equations_algo_la_rpath) $(libscidifferential_equations_algo_la_OBJECTS) $(libscidifferential_equations_algo_la_LIBADD) $(LIBS)
 libscidifferential_equations.la: $(libscidifferential_equations_la_OBJECTS) $(libscidifferential_equations_la_DEPENDENCIES) 
-       $(libscidifferential_equations_la_LINK) -rpath $(pkglibdir) $(libscidifferential_equations_la_OBJECTS) $(libscidifferential_equations_la_LIBADD) $(LIBS)
+       $(libscidifferential_equations_la_LINK) $(am_libscidifferential_equations_la_rpath) $(libscidifferential_equations_la_OBJECTS) $(libscidifferential_equations_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index e014f8a..58d391b 100644 (file)
@@ -27,7 +27,12 @@ sci_gateway/fortran/matcc.f \
 sci_gateway/fortran/mattrc.f \
 sci_gateway/fortran/matadd.f
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscidouble.la
+else
+noinst_LTLIBRARIES = libscidouble.la
+endif
+
 
 libscidouble_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 6dd7d79..0b61e31 100644 (file)
@@ -107,7 +107,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscidouble_la_etcdir)" \
        "$(DESTDIR)$(libscidouble_la_rootdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscidouble_la_LIBADD =
 am__objects_1 = libscidouble_la-gw_double.lo
 am__objects_2 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \
@@ -119,6 +119,8 @@ libscidouble_la_OBJECTS = $(am_libscidouble_la_OBJECTS)
 libscidouble_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscidouble_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscidouble_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidouble_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -416,7 +418,8 @@ sci_gateway/fortran/matcc.f \
 sci_gateway/fortran/mattrc.f \
 sci_gateway/fortran/matadd.f
 
-pkglib_LTLIBRARIES = libscidouble.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidouble.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscidouble.la
 libscidouble_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
@@ -534,6 +537,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -566,7 +578,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscidouble.la: $(libscidouble_la_OBJECTS) $(libscidouble_la_DEPENDENCIES) 
-       $(libscidouble_la_LINK) -rpath $(pkglibdir) $(libscidouble_la_OBJECTS) $(libscidouble_la_LIBADD) $(LIBS)
+       $(libscidouble_la_LINK) $(am_libscidouble_la_rpath) $(libscidouble_la_OBJECTS) $(libscidouble_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -840,7 +852,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -914,14 +926,14 @@ uninstall-am: uninstall-libscidouble_la_etcDATA \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libscidouble_la_etcDATA \
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libscidouble_la_etcDATA \
        install-libscidouble_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
index 8b2ac03..9319d29 100644 (file)
@@ -33,8 +33,13 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(srcdir)/includes/
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscidynamic_link.la
 noinst_LTLIBRARIES = libscidynamic_link-algo.la
+else
+noinst_LTLIBRARIES = libscidynamic_link-algo.la libscidynamic_link.la
+endif
+
 
 
 libscidynamic_link_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index e6bda0f..5e3cf3a 100644 (file)
@@ -125,6 +125,8 @@ libscidynamic_link_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscidynamic_link_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscidynamic_link_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidynamic_link_algo_la_rpath =
 libscidynamic_link_la_DEPENDENCIES = libscidynamic_link-algo.la
 am__objects_2 = libscidynamic_link_la-gw_dynamic_link.lo \
        libscidynamic_link_la-sci_getdynlibext.lo \
@@ -140,6 +142,9 @@ libscidynamic_link_la_OBJECTS = $(am_libscidynamic_link_la_OBJECTS)
 libscidynamic_link_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscidynamic_link_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscidynamic_link_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscidynamic_link_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 SCRIPTS = $(libscidynamic_link_la_script_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -448,8 +453,9 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(srcdir)/includes/
 
-pkglib_LTLIBRARIES = libscidynamic_link.la
-noinst_LTLIBRARIES = libscidynamic_link-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidynamic_link.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscidynamic_link-algo.la libscidynamic_link.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscidynamic_link-algo.la
 libscidynamic_link_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscidynamic_link_algo_la_SOURCES = $(DYNAMIC_LINK_C_SOURCES)
 libscidynamic_link_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -635,9 +641,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscidynamic_link-algo.la: $(libscidynamic_link_algo_la_OBJECTS) $(libscidynamic_link_algo_la_DEPENDENCIES) 
-       $(libscidynamic_link_algo_la_LINK)  $(libscidynamic_link_algo_la_OBJECTS) $(libscidynamic_link_algo_la_LIBADD) $(LIBS)
+       $(libscidynamic_link_algo_la_LINK) $(am_libscidynamic_link_algo_la_rpath) $(libscidynamic_link_algo_la_OBJECTS) $(libscidynamic_link_algo_la_LIBADD) $(LIBS)
 libscidynamic_link.la: $(libscidynamic_link_la_OBJECTS) $(libscidynamic_link_la_DEPENDENCIES) 
-       $(libscidynamic_link_la_LINK) -rpath $(pkglibdir) $(libscidynamic_link_la_OBJECTS) $(libscidynamic_link_la_LIBADD) $(LIBS)
+       $(libscidynamic_link_la_LINK) $(am_libscidynamic_link_la_rpath) $(libscidynamic_link_la_OBJECTS) $(libscidynamic_link_la_LIBADD) $(LIBS)
 install-libscidynamic_link_la_scriptSCRIPTS: $(libscidynamic_link_la_script_SCRIPTS)
        @$(NORMAL_INSTALL)
        test -z "$(libscidynamic_link_la_scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(libscidynamic_link_la_scriptdir)"
index 4f499a0..6e62721 100644 (file)
@@ -394,8 +394,14 @@ libscielementary_functions_la_CFLAGS=      -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscielementary_functions.la
 noinst_LTLIBRARIES += libscielementary_functions-algo.la
+else
+noinst_LTLIBRARIES += libscielementary_functions-algo.la libscielementary_functions.la
+endif
+
+
 
 libscielementary_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 65f916e..21e57ce 100644 (file)
@@ -56,9 +56,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@MAINTAINER_MODE_TRUE@am__append_1 = libscielementary_functions-algo.la
+@MAINTAINER_MODE_FALSE@am__append_2 = libscielementary_functions-algo.la libscielementary_functions.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_1 = java
+@NEED_JAVA_TRUE@am__append_3 = java
 subdir = modules/elementary_functions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -189,6 +191,8 @@ am_libscielementary_functions_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_5) $(am__objects_6)
 libscielementary_functions_algo_la_OBJECTS =  \
        $(am_libscielementary_functions_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscielementary_functions_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscielementary_functions_algo_la_rpath =
 libscielementary_functions_la_DEPENDENCIES =  \
        libdummy-elementary_functions.la \
        libscielementary_functions-algo.la
@@ -297,6 +301,9 @@ libscielementary_functions_la_LINK = $(LIBTOOL) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
        $(libscielementary_functions_la_FFLAGS) $(FFLAGS) \
        $(libscielementary_functions_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscielementary_functions_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscielementary_functions_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -932,8 +939,8 @@ sci_gateway/fortran/sci_f_exp.f
 EISPACK_SOURCES = src/fortran/eispack/balbak.f
 
 # Disable optimisation of the file hqror2.f comqr3.f pade.f
-noinst_LTLIBRARIES = libdummy-elementary_functions.la \
-       libscielementary_functions-algo.la
+noinst_LTLIBRARIES = libdummy-elementary_functions.la $(am__append_1) \
+       $(am__append_2)
 libdummy_elementary_functions_la_SOURCES = src/fortran/eispack/hqror2.f \
        src/fortran/comqr3.f \
        src/fortran/linpack/pade.f \
@@ -966,7 +973,7 @@ libscielementary_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscielementary_functions.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscielementary_functions.la
 libscielementary_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscielementary_functions_algo_la_SOURCES = $(SLATEC_SOURCES) $(LINPACK_SOURCES)  $(EISPACK_SOURCES) $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES) $(ELEMENTARIES_FUNCTIONS_CPP_SOURCES)
 libscielementary_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) 
@@ -1003,7 +1010,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1)
+TARGETS_ALL = $(am__append_3)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -1131,9 +1138,9 @@ clean-pkglibLTLIBRARIES:
 libdummy-elementary_functions.la: $(libdummy_elementary_functions_la_OBJECTS) $(libdummy_elementary_functions_la_DEPENDENCIES) 
        $(libdummy_elementary_functions_la_LINK)  $(libdummy_elementary_functions_la_OBJECTS) $(libdummy_elementary_functions_la_LIBADD) $(LIBS)
 libscielementary_functions-algo.la: $(libscielementary_functions_algo_la_OBJECTS) $(libscielementary_functions_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscielementary_functions_algo_la_OBJECTS) $(libscielementary_functions_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscielementary_functions_algo_la_rpath) $(libscielementary_functions_algo_la_OBJECTS) $(libscielementary_functions_algo_la_LIBADD) $(LIBS)
 libscielementary_functions.la: $(libscielementary_functions_la_OBJECTS) $(libscielementary_functions_la_DEPENDENCIES) 
-       $(libscielementary_functions_la_LINK) -rpath $(pkglibdir) $(libscielementary_functions_la_OBJECTS) $(libscielementary_functions_la_LIBADD) $(LIBS)
+       $(libscielementary_functions_la_LINK) $(am_libscielementary_functions_la_rpath) $(libscielementary_functions_la_OBJECTS) $(libscielementary_functions_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 61b405e..ade0cd0 100644 (file)
 
 modulename=fftw
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscifftw.la
+noinst_LTLIBRARIES =
+else
+noinst_LTLIBRARIES = libscifftw.la
+endif
+
 
 if FFTW
-noinst_LTLIBRARIES = libscifftw-algo.la
+noinst_LTLIBRARIES += libscifftw-algo.la
 endif
 
 libscifftw_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(FFTW3_LIB)
index 2284c4f..3f75982 100644 (file)
@@ -61,9 +61,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@FFTW_TRUE@am__append_1 = libscifftw-algo.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_1 = java
+@NEED_JAVA_TRUE@am__append_2 = java
 subdir = modules/fftw
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -129,7 +130,8 @@ libscifftw_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscifftw_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-@FFTW_TRUE@am_libscifftw_algo_la_rpath =
+@FFTW_TRUE@@MAINTAINER_MODE_FALSE@am_libscifftw_algo_la_rpath =
+@FFTW_TRUE@@MAINTAINER_MODE_TRUE@am_libscifftw_algo_la_rpath =
 @FFTW_TRUE@libscifftw_la_DEPENDENCIES = libscifftw-algo.la
 am__libscifftw_la_SOURCES_DIST = src/nofftw/nofftw.c src/c/callfftw.c \
        src/c/fftwlibname.c src/c/fftw_utilities.c src/c/with_fftw.c \
@@ -161,6 +163,8 @@ libscifftw_la_OBJECTS = $(am_libscifftw_la_OBJECTS)
 libscifftw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscifftw_la_CFLAGS) \
        $(CFLAGS) $(libscifftw_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscifftw_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscifftw_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -431,8 +435,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 modulename = fftw
-pkglib_LTLIBRARIES = libscifftw.la
-@FFTW_TRUE@noinst_LTLIBRARIES = libscifftw-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscifftw.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscifftw.la \
+@MAINTAINER_MODE_FALSE@        $(am__append_1)
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = $(am__append_1)
 libscifftw_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(FFTW3_LIB)
 
 #### fftw : Conf files ####
@@ -498,7 +504,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1)
+TARGETS_ALL = $(am__append_2)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -626,7 +632,7 @@ clean-pkglibLTLIBRARIES:
 libscifftw-algo.la: $(libscifftw_algo_la_OBJECTS) $(libscifftw_algo_la_DEPENDENCIES) 
        $(libscifftw_algo_la_LINK) $(am_libscifftw_algo_la_rpath) $(libscifftw_algo_la_OBJECTS) $(libscifftw_algo_la_LIBADD) $(LIBS)
 libscifftw.la: $(libscifftw_la_OBJECTS) $(libscifftw_la_DEPENDENCIES) 
-       $(libscifftw_la_LINK) -rpath $(pkglibdir) $(libscifftw_la_OBJECTS) $(libscifftw_la_LIBADD) $(LIBS)
+       $(libscifftw_la_LINK) $(am_libscifftw_la_rpath) $(libscifftw_la_OBJECTS) $(libscifftw_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 85e970e..5a736a8 100644 (file)
@@ -122,8 +122,13 @@ libscifileio_la_CFLAGS=            -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/localization/includes
 
-noinst_LTLIBRARIES = libscifileio-algo.la
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscifileio.la
+noinst_LTLIBRARIES = libscifileio-algo.la
+else
+noinst_LTLIBRARIES = libscifileio-algo.la libscifileio.la
+endif
+
 
 libscifileio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index f8254d0..d519c2f 100644 (file)
@@ -162,6 +162,8 @@ libscifileio_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscifileio_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscifileio_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscifileio_algo_la_rpath =
 libscifileio_la_DEPENDENCIES = libscifileio-algo.la
 am__objects_2 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_mfprintf.lo libscifileio_la-sci_mscanf.lo \
@@ -201,6 +203,8 @@ libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS)
 libscifileio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscifileio_la_CFLAGS) \
        $(CFLAGS) $(libscifileio_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscifileio_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscifileio_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -587,8 +591,9 @@ libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/localization/includes
 
-noinst_LTLIBRARIES = libscifileio-algo.la
-pkglib_LTLIBRARIES = libscifileio.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscifileio.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscifileio-algo.la libscifileio.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscifileio-algo.la
 libscifileio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
 libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
@@ -759,9 +764,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscifileio-algo.la: $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_DEPENDENCIES) 
-       $(libscifileio_algo_la_LINK)  $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_LIBADD) $(LIBS)
+       $(libscifileio_algo_la_LINK) $(am_libscifileio_algo_la_rpath) $(libscifileio_algo_la_OBJECTS) $(libscifileio_algo_la_LIBADD) $(LIBS)
 libscifileio.la: $(libscifileio_la_OBJECTS) $(libscifileio_la_DEPENDENCIES) 
-       $(libscifileio_la_LINK) -rpath $(pkglibdir) $(libscifileio_la_OBJECTS) $(libscifileio_la_LIBADD) $(LIBS)
+       $(libscifileio_la_LINK) $(am_libscifileio_la_rpath) $(libscifileio_la_OBJECTS) $(libscifileio_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index ed1e34f..d078247 100644 (file)
@@ -95,19 +95,25 @@ libscihdf5_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscihdf5_la_sci_gateway_DATA = sci_gateway/hdf5_gateway.xml
 
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscihdf5.la
+noinst_LTLIBRARIES = 
+else
+noinst_LTLIBRARIES = libscihdf5.la
+endif
+
 if HDF5
-noinst_LTLIBRARIES = libscihdf5-algo.la
+noinst_LTLIBRARIES += libscihdf5-algo.la
 endif
 
 if HDF5
 # When Scilab is built with HDF5, we need some libraries for a workaround
 
 if NEED_JAVA
-pkglib_LTLIBRARIES += libscihdf5-forceload.la
+noinst_LTLIBRARIES += libscihdf5-forceload.la
 endif
 
-pkglib_LTLIBRARIES += libscihdf5-forceload-disable.la
+noinst_LTLIBRARIES += libscihdf5-forceload-disable.la
 endif
 
 libscihdf5_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(HDF5_LIBS)
@@ -124,8 +130,8 @@ INCLUDE_FLAGS = $(libscihdf5_la_CFLAGS)
 # pb of order
 if HDF5
 libscihdf5_la_LIBADD = libscihdf5-algo.la \
-                               $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                               $(top_builddir)/modules/output_stream/libscioutput_stream.la
+                               $(top_builddir)/libs/MALLOC/libscimalloc.la
+
 else
 libscihdf5_la_LIBADD =
 endif
index fe6462c..def96db 100644 (file)
@@ -60,13 +60,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@HDF5_TRUE@am__append_1 = libscihdf5-algo.la
 
 # When Scilab is built with HDF5, we need some libraries for a workaround
-@HDF5_TRUE@@NEED_JAVA_TRUE@am__append_1 = libscihdf5-forceload.la
-@HDF5_TRUE@am__append_2 = libscihdf5-forceload-disable.la
+@HDF5_TRUE@@NEED_JAVA_TRUE@am__append_2 = libscihdf5-forceload.la
+@HDF5_TRUE@am__append_3 = libscihdf5-forceload-disable.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_3 = java
+@NEED_JAVA_TRUE@am__append_4 = java
 subdir = modules/hdf5
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
@@ -129,7 +130,8 @@ libscihdf5_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscihdf5_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-@HDF5_TRUE@am_libscihdf5_algo_la_rpath =
+@HDF5_TRUE@@MAINTAINER_MODE_FALSE@am_libscihdf5_algo_la_rpath =
+@HDF5_TRUE@@MAINTAINER_MODE_TRUE@am_libscihdf5_algo_la_rpath =
 libscihdf5_forceload_disable_la_LIBADD =
 am__libscihdf5_forceload_disable_la_SOURCES_DIST =  \
        src/cpp/forceJHDF5load-jvmdisable.cpp
@@ -142,8 +144,8 @@ libscihdf5_forceload_disable_la_LINK = $(LIBTOOL) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
        $(AM_CXXFLAGS) $(CXXFLAGS) \
        $(libscihdf5_forceload_disable_la_LDFLAGS) $(LDFLAGS) -o $@
-@HDF5_TRUE@am_libscihdf5_forceload_disable_la_rpath = -rpath \
-@HDF5_TRUE@    $(pkglibdir)
+@HDF5_TRUE@@MAINTAINER_MODE_FALSE@am_libscihdf5_forceload_disable_la_rpath =
+@HDF5_TRUE@@MAINTAINER_MODE_TRUE@am_libscihdf5_forceload_disable_la_rpath =
 libscihdf5_forceload_la_LIBADD =
 am__libscihdf5_forceload_la_SOURCES_DIST = src/cpp/forceJHDF5load.cpp \
        src/jni/jhdf5load.hxx src/jni/jhdf5load.cpp
@@ -156,11 +158,10 @@ libscihdf5_forceload_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libscihdf5_forceload_la_LDFLAGS) $(LDFLAGS) -o \
        $@
-@HDF5_TRUE@@NEED_JAVA_TRUE@am_libscihdf5_forceload_la_rpath = -rpath \
-@HDF5_TRUE@@NEED_JAVA_TRUE@    $(pkglibdir)
+@HDF5_TRUE@@MAINTAINER_MODE_FALSE@@NEED_JAVA_TRUE@am_libscihdf5_forceload_la_rpath =
+@HDF5_TRUE@@MAINTAINER_MODE_TRUE@@NEED_JAVA_TRUE@am_libscihdf5_forceload_la_rpath =
 @HDF5_TRUE@libscihdf5_la_DEPENDENCIES = libscihdf5-algo.la \
-@HDF5_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@HDF5_TRUE@    $(top_builddir)/modules/output_stream/libscioutput_stream.la
+@HDF5_TRUE@    $(top_builddir)/libs/MALLOC/libscimalloc.la
 am__libscihdf5_la_SOURCES_DIST = sci_gateway/cpp/sci_no_hdf5.cpp \
        sci_gateway/cpp/sci_export_to_hdf5.cpp \
        sci_gateway/cpp/sci_import_from_hdf5.cpp \
@@ -174,6 +175,8 @@ libscihdf5_la_OBJECTS = $(am_libscihdf5_la_OBJECTS)
 libscihdf5_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libscihdf5_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscihdf5_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscihdf5_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -518,8 +521,12 @@ libscihdf5_la_CFLAGS = -I$(srcdir)/includes/ \
 #### hdf5 : gateway declaration ####
 libscihdf5_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscihdf5_la_sci_gateway_DATA = sci_gateway/hdf5_gateway.xml
-pkglib_LTLIBRARIES = libscihdf5.la $(am__append_1) $(am__append_2)
-@HDF5_TRUE@noinst_LTLIBRARIES = libscihdf5-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscihdf5.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscihdf5.la \
+@MAINTAINER_MODE_FALSE@        $(am__append_1) $(am__append_2) \
+@MAINTAINER_MODE_FALSE@        $(am__append_3)
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = $(am__append_1) \
+@MAINTAINER_MODE_TRUE@ $(am__append_2) $(am__append_3)
 libscihdf5_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(HDF5_LIBS)
 libscihdf5_algo_la_SOURCES = $(HDF5_SOURCES)
 libscihdf5_la_SOURCES = $(GATEWAY_CPP_SOURCES) $(GATEWAY_C_SOURCES) 
@@ -533,8 +540,7 @@ INCLUDE_FLAGS = $(libscihdf5_la_CFLAGS)
 
 # pb of order
 @HDF5_TRUE@libscihdf5_la_LIBADD = libscihdf5-algo.la \
-@HDF5_TRUE@                            $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@HDF5_TRUE@                            $(top_builddir)/modules/output_stream/libscioutput_stream.la
+@HDF5_TRUE@                            $(top_builddir)/libs/MALLOC/libscimalloc.la
 
 
 #### Target ######
@@ -559,7 +565,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_3)
+TARGETS_ALL = $(am__append_4)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -692,7 +698,7 @@ libscihdf5-forceload-disable.la: $(libscihdf5_forceload_disable_la_OBJECTS) $(li
 libscihdf5-forceload.la: $(libscihdf5_forceload_la_OBJECTS) $(libscihdf5_forceload_la_DEPENDENCIES) 
        $(libscihdf5_forceload_la_LINK) $(am_libscihdf5_forceload_la_rpath) $(libscihdf5_forceload_la_OBJECTS) $(libscihdf5_forceload_la_LIBADD) $(LIBS)
 libscihdf5.la: $(libscihdf5_la_OBJECTS) $(libscihdf5_la_DEPENDENCIES) 
-       $(libscihdf5_la_LINK) -rpath $(pkglibdir) $(libscihdf5_la_OBJECTS) $(libscihdf5_la_LIBADD) $(LIBS)
+       $(libscihdf5_la_LINK) $(am_libscihdf5_la_rpath) $(libscihdf5_la_OBJECTS) $(libscihdf5_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index caa5253..2d4e7d2 100644 (file)
@@ -70,8 +70,13 @@ libscihistory_manager_la_CFLAGS=     $(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscihistory_manager.la
 noinst_LTLIBRARIES = libscihistory_manager-algo.la
+else
+noinst_LTLIBRARIES = libscihistory_manager-algo.la libscihistory_manager.la
+endif
+
 
 libscihistory_manager_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index b8d4dea..3ab6613 100644 (file)
@@ -132,6 +132,8 @@ am_libscihistory_manager_algo_la_OBJECTS = $(am__objects_2) \
        $(am__objects_3)
 libscihistory_manager_algo_la_OBJECTS =  \
        $(am_libscihistory_manager_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscihistory_manager_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscihistory_manager_algo_la_rpath =
 libscihistory_manager_la_DEPENDENCIES = libscihistory_manager-algo.la
 am__objects_4 = libscihistory_manager_la-gw_history_manager.lo \
        libscihistory_manager_la-sci_addhistory.lo \
@@ -154,6 +156,9 @@ libscihistory_manager_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscihistory_manager_la_CFLAGS) $(CFLAGS) \
        $(libscihistory_manager_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscihistory_manager_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscihistory_manager_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -495,8 +500,9 @@ libscihistory_manager_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
-pkglib_LTLIBRARIES = libscihistory_manager.la
-noinst_LTLIBRARIES = libscihistory_manager-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscihistory_manager.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscihistory_manager-algo.la libscihistory_manager.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscihistory_manager-algo.la
 libscihistory_manager_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libscihistory_manager.la
@@ -673,9 +679,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscihistory_manager-algo.la: $(libscihistory_manager_algo_la_OBJECTS) $(libscihistory_manager_algo_la_DEPENDENCIES) 
-       $(CXXLINK)  $(libscihistory_manager_algo_la_OBJECTS) $(libscihistory_manager_algo_la_LIBADD) $(LIBS)
+       $(CXXLINK) $(am_libscihistory_manager_algo_la_rpath) $(libscihistory_manager_algo_la_OBJECTS) $(libscihistory_manager_algo_la_LIBADD) $(LIBS)
 libscihistory_manager.la: $(libscihistory_manager_la_OBJECTS) $(libscihistory_manager_la_DEPENDENCIES) 
-       $(libscihistory_manager_la_LINK) -rpath $(pkglibdir) $(libscihistory_manager_la_OBJECTS) $(libscihistory_manager_la_LIBADD) $(LIBS)
+       $(libscihistory_manager_la_LINK) $(am_libscihistory_manager_la_rpath) $(libscihistory_manager_la_OBJECTS) $(libscihistory_manager_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index f02e66f..61b56fd 100644 (file)
@@ -118,8 +118,13 @@ libsciinteger_la_CFLAGS=   -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciinteger.la
 noinst_LTLIBRARIES = libsciinteger-algo.la
+else
+noinst_LTLIBRARIES = libsciinteger-algo.la libsciinteger.la
+endif
+
 
 libsciinteger_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 725f0a7..9b5f3d7 100644 (file)
@@ -162,6 +162,8 @@ am__objects_2 = unarybit.lo i_mput.lo i_logic.lo i_a_i.lo i_b_i.lo \
        i_cumprod.lo i_cumsum.lo i_kron.lo
 am_libsciinteger_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciinteger_algo_la_OBJECTS = $(am_libsciinteger_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libsciinteger_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciinteger_algo_la_rpath =
 libsciinteger_la_DEPENDENCIES = libsciinteger-algo.la
 am__objects_3 = libsciinteger_la-gw_integer.lo
 am__objects_4 = sci_i_matrix.lo sci_i_mput.lo sci_i_max.lo \
@@ -176,6 +178,8 @@ libsciinteger_la_OBJECTS = $(am_libsciinteger_la_OBJECTS)
 libsciinteger_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libsciinteger_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciinteger_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciinteger_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -566,8 +570,9 @@ libsciinteger_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
-pkglib_LTLIBRARIES = libsciinteger.la
-noinst_LTLIBRARIES = libsciinteger-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciinteger.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciinteger-algo.la libsciinteger.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libsciinteger-algo.la
 libsciinteger_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libsciinteger_algo_la_SOURCES = $(INTEGER_C_SOURCES) $(INTEGER_FORTRAN_SOURCES) 
 libsciinteger_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -732,9 +737,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciinteger-algo.la: $(libsciinteger_algo_la_OBJECTS) $(libsciinteger_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libsciinteger_algo_la_OBJECTS) $(libsciinteger_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libsciinteger_algo_la_rpath) $(libsciinteger_algo_la_OBJECTS) $(libsciinteger_algo_la_LIBADD) $(LIBS)
 libsciinteger.la: $(libsciinteger_la_OBJECTS) $(libsciinteger_la_DEPENDENCIES) 
-       $(libsciinteger_la_LINK) -rpath $(pkglibdir) $(libsciinteger_la_OBJECTS) $(libsciinteger_la_LIBADD) $(LIBS)
+       $(libsciinteger_la_LINK) $(am_libsciinteger_la_rpath) $(libsciinteger_la_OBJECTS) $(libsciinteger_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index acff551..2897e00 100644 (file)
@@ -24,7 +24,12 @@ src/exe/check.c
 libsciintersci_la_includedir=$(pkgincludedir)
 libsciintersci_la_include_HEADERS = includes/libinter.h
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciintersci.la
+else
+noinst_LTLIBRARIES = libsciintersci.la
+endif
+
 
 libsciintersci_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index f3bb047..2aae16d 100644 (file)
@@ -112,7 +112,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(libsciintersci_la_etcdir)" \
        "$(DESTDIR)$(libsciintersci_la_rootdir)" \
        "$(DESTDIR)$(libsciintersci_la_includedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciintersci_la_LIBADD =
 am__objects_1 = libsciintersci_la-libinter.lo libsciintersci_la-out.lo
 am_libsciintersci_la_OBJECTS = $(am__objects_1)
@@ -121,6 +121,8 @@ libsciintersci_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciintersci_la_CFLAGS) $(CFLAGS) \
        $(libsciintersci_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciintersci_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciintersci_la_rpath = -rpath $(pkglibdir)
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_2 = intersci-n.$(OBJEXT) getrhs.$(OBJEXT) crerhs.$(OBJEXT) \
        variables.$(OBJEXT) read.$(OBJEXT) fornames.$(OBJEXT) \
@@ -416,7 +418,8 @@ src/exe/check.c
 
 libsciintersci_la_includedir = $(pkgincludedir)
 libsciintersci_la_include_HEADERS = includes/libinter.h
-pkglib_LTLIBRARIES = libsciintersci.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciintersci.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciintersci.la
 libsciintersci_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
 libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
@@ -537,6 +540,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -569,7 +581,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciintersci.la: $(libsciintersci_la_OBJECTS) $(libsciintersci_la_DEPENDENCIES) 
-       $(libsciintersci_la_LINK) -rpath $(pkglibdir) $(libsciintersci_la_OBJECTS) $(libsciintersci_la_LIBADD) $(LIBS)
+       $(libsciintersci_la_LINK) $(am_libsciintersci_la_rpath) $(libsciintersci_la_OBJECTS) $(libsciintersci_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -1011,7 +1023,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -1089,14 +1101,15 @@ uninstall-am: uninstall-binPROGRAMS \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-binPROGRAMS clean-generic clean-libtool \
-       clean-local clean-pkglibLTLIBRARIES ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-local distclean-tags distdir dvi dvi-am html html-am \
-       info info-am install install-am install-binPROGRAMS \
-       install-data install-data-am install-data-local install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-html-local install-info \
-       install-info-am install-libsciintersci_la_etcDATA \
+       clean-local clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES \
+       ctags distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-binPROGRAMS install-data install-data-am \
+       install-data-local install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am \
+       install-html-local install-info install-info-am \
+       install-libsciintersci_la_etcDATA \
        install-libsciintersci_la_includeHEADERS \
        install-libsciintersci_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
index 41e8d2c..16d5f36 100644 (file)
@@ -53,8 +53,13 @@ libsciio_la_CPPFLAGS=        -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciio.la
 noinst_LTLIBRARIES = libsciio-algo.la
+else
+noinst_LTLIBRARIES = libsciio-algo.la libsciio.la
+endif
+
 
 libsciio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 95ea0aa..6414ccc 100644 (file)
@@ -117,6 +117,8 @@ am__objects_1 = libsciio_algo_la-getpidc.lo \
 am__objects_2 = v2unit.lo newsave.lo v2cunit.lo
 am_libsciio_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciio_algo_la_OBJECTS = $(am_libsciio_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libsciio_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciio_algo_la_rpath =
 libsciio_la_DEPENDENCIES = libsciio-algo.la
 am__objects_3 = libsciio_la-sci_read4b.lo libsciio_la-sci_getio.lo \
        libsciio_la-sci_readb.lo libsciio_la-sci_host.lo \
@@ -133,6 +135,8 @@ libsciio_la_OBJECTS = $(am_libsciio_la_OBJECTS)
 libsciio_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libsciio_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciio_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciio_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -456,8 +460,9 @@ libsciio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
-pkglib_LTLIBRARIES = libsciio.la
-noinst_LTLIBRARIES = libsciio-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciio.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciio-algo.la libsciio.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libsciio-algo.la
 libsciio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libsciio_algo_la_SOURCES = $(IO_C_SOURCES) $(IO_FORTRAN_SOURCES)
 libsciio_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -620,9 +625,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciio-algo.la: $(libsciio_algo_la_OBJECTS) $(libsciio_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libsciio_algo_la_OBJECTS) $(libsciio_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libsciio_algo_la_rpath) $(libsciio_algo_la_OBJECTS) $(libsciio_algo_la_LIBADD) $(LIBS)
 libsciio.la: $(libsciio_la_OBJECTS) $(libsciio_la_DEPENDENCIES) 
-       $(libsciio_la_LINK) -rpath $(pkglibdir) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS)
+       $(libsciio_la_LINK) $(am_libsciio_la_rpath) $(libsciio_la_OBJECTS) $(libsciio_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 9f67d61..1af56aa 100644 (file)
@@ -95,8 +95,13 @@ libscilinear_algebra_la_CFLAGS=      -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/elementary_functions/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscilinear_algebra.la
 noinst_LTLIBRARIES = libscilinear_algebra-algo.la
+else
+noinst_LTLIBRARIES = libscilinear_algebra-algo.la libscilinear_algebra.la
+endif
+
 
 libscilinear_algebra_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index cd3dec8..e6718c9 100644 (file)
@@ -129,6 +129,8 @@ am_libscilinear_algebra_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscilinear_algebra_algo_la_OBJECTS =  \
        $(am_libscilinear_algebra_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscilinear_algebra_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscilinear_algebra_algo_la_rpath =
 libscilinear_algebra_la_DEPENDENCIES = libscilinear_algebra-algo.la
 am__objects_3 = libscilinear_algebra_la-sci_backslash.lo \
        libscilinear_algebra_la-sci_hess.lo \
@@ -161,6 +163,9 @@ libscilinear_algebra_la_OBJECTS =  \
 libscilinear_algebra_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscilinear_algebra_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscilinear_algebra_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscilinear_algebra_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -529,8 +534,9 @@ libscilinear_algebra_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/elementary_functions/includes
 
-pkglib_LTLIBRARIES = libscilinear_algebra.la
-noinst_LTLIBRARIES = libscilinear_algebra-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscilinear_algebra.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscilinear_algebra-algo.la libscilinear_algebra.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscilinear_algebra-algo.la
 libscilinear_algebra_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscilinear_algebra_algo_la_SOURCES = $(LINEAR_ALGEBRA_FORTRAN_SOURCES) $(LINEAR_ALGEBRA_C_SOURCES)
 libscilinear_algebra_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -692,9 +698,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscilinear_algebra-algo.la: $(libscilinear_algebra_algo_la_OBJECTS) $(libscilinear_algebra_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscilinear_algebra_algo_la_OBJECTS) $(libscilinear_algebra_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscilinear_algebra_algo_la_rpath) $(libscilinear_algebra_algo_la_OBJECTS) $(libscilinear_algebra_algo_la_LIBADD) $(LIBS)
 libscilinear_algebra.la: $(libscilinear_algebra_la_OBJECTS) $(libscilinear_algebra_la_DEPENDENCIES) 
-       $(libscilinear_algebra_la_LINK) -rpath $(pkglibdir) $(libscilinear_algebra_la_OBJECTS) $(libscilinear_algebra_la_LIBADD) $(LIBS)
+       $(libscilinear_algebra_la_LINK) $(am_libscilinear_algebra_la_rpath) $(libscilinear_algebra_la_OBJECTS) $(libscilinear_algebra_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 05c115f..41a9e80 100644 (file)
@@ -41,8 +41,13 @@ libscilocalization_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscilocalization.la
 noinst_LTLIBRARIES = libscilocalization-algo.la
+else
+noinst_LTLIBRARIES = libscilocalization-algo.la libscilocalization.la
+endif
+
 
 libscilocalization_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index b854149..fc5251b 100644 (file)
@@ -144,6 +144,8 @@ libscilocalization_algo_la_LINK = $(LIBTOOL) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscilocalization_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscilocalization_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscilocalization_algo_la_rpath =
 libscilocalization_la_DEPENDENCIES = libscilocalization-algo.la
 am__objects_4 = libscilocalization_la-gw_localization.lo \
        libscilocalization_la-sci_gettext.lo \
@@ -158,6 +160,9 @@ libscilocalization_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscilocalization_la_CFLAGS) $(CFLAGS) \
        $(libscilocalization_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscilocalization_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscilocalization_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -448,8 +453,9 @@ libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) -I/sw/include \
        -I$(top_srcdir)/modules/fileio/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
        -I$(top_srcdir)/modules/output_stream/includes $(am__append_4)
-pkglib_LTLIBRARIES = libscilocalization.la
-noinst_LTLIBRARIES = libscilocalization-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscilocalization.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscilocalization-algo.la libscilocalization.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscilocalization-algo.la
 libscilocalization_la_LDFLAGS = -version-number \
        $(SCILAB_LIBRARY_VERSION) $(am__append_3)
 libscilocalization_algo_la_SOURCES = $(LOCALIZATION_C_SOURCES)
@@ -629,9 +635,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscilocalization-algo.la: $(libscilocalization_algo_la_OBJECTS) $(libscilocalization_algo_la_DEPENDENCIES) 
-       $(libscilocalization_algo_la_LINK)  $(libscilocalization_algo_la_OBJECTS) $(libscilocalization_algo_la_LIBADD) $(LIBS)
+       $(libscilocalization_algo_la_LINK) $(am_libscilocalization_algo_la_rpath) $(libscilocalization_algo_la_OBJECTS) $(libscilocalization_algo_la_LIBADD) $(LIBS)
 libscilocalization.la: $(libscilocalization_la_OBJECTS) $(libscilocalization_la_DEPENDENCIES) 
-       $(libscilocalization_la_LINK) -rpath $(pkglibdir) $(libscilocalization_la_OBJECTS) $(libscilocalization_la_LIBADD) $(LIBS)
+       $(libscilocalization_la_LINK) $(am_libscilocalization_la_rpath) $(libscilocalization_la_OBJECTS) $(libscilocalization_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 5c0575c..1f4240e 100644 (file)
@@ -13,7 +13,12 @@ MEXLIB_FLAGS = -I$(srcdir)/includes/ \
 
 MEXLIB_FLAGS += -I$(top_srcdir)/modules/string/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
+else
+noinst_LTLIBRARIES = libmat.la libmex.la libmx.la
+endif
+
 
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
 
index c3cf1ae..91243e4 100644 (file)
@@ -109,7 +109,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libmex_la_etcdir)" \
        "$(DESTDIR)$(libmex_la_rootdir)" \
        "$(DESTDIR)$(libmex_la_includedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libmat_la_DEPENDENCIES =
 am__objects_1 = libmat_la-mexlib.lo libmat_la-sci_gateway.lo
 am_libmat_la_OBJECTS = $(am__objects_1)
@@ -117,6 +117,8 @@ libmat_la_OBJECTS = $(am_libmat_la_OBJECTS)
 libmat_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmat_la_CFLAGS) \
        $(CFLAGS) $(libmat_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libmat_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libmat_la_rpath = -rpath $(pkglibdir)
 libmex_la_DEPENDENCIES =
 am__objects_2 = libmex_la-mexlib.lo libmex_la-sci_gateway.lo
 am_libmex_la_OBJECTS = $(am__objects_2)
@@ -124,6 +126,8 @@ libmex_la_OBJECTS = $(am_libmex_la_OBJECTS)
 libmex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmex_la_CFLAGS) \
        $(CFLAGS) $(libmex_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libmex_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libmex_la_rpath = -rpath $(pkglibdir)
 libmx_la_DEPENDENCIES =
 am__objects_3 = libmx_la-mexlib.lo libmx_la-sci_gateway.lo
 am_libmx_la_OBJECTS = $(am__objects_3)
@@ -131,6 +135,8 @@ libmx_la_OBJECTS = $(am_libmx_la_OBJECTS)
 libmx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(libmx_la_CFLAGS) $(CFLAGS) \
        $(libmx_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libmx_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libmx_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -409,7 +415,8 @@ MEXLIB_FLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/string/includes
-pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libmat.la libmex.la libmx.la
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
 libmex_la_LIBADD = $(MEXLIB_DEP)
 libmex_la_CFLAGS = $(MEXLIB_FLAGS)
@@ -540,6 +547,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -572,11 +588,11 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libmat.la: $(libmat_la_OBJECTS) $(libmat_la_DEPENDENCIES) 
-       $(libmat_la_LINK) -rpath $(pkglibdir) $(libmat_la_OBJECTS) $(libmat_la_LIBADD) $(LIBS)
+       $(libmat_la_LINK) $(am_libmat_la_rpath) $(libmat_la_OBJECTS) $(libmat_la_LIBADD) $(LIBS)
 libmex.la: $(libmex_la_OBJECTS) $(libmex_la_DEPENDENCIES) 
-       $(libmex_la_LINK) -rpath $(pkglibdir) $(libmex_la_OBJECTS) $(libmex_la_LIBADD) $(LIBS)
+       $(libmex_la_LINK) $(am_libmex_la_rpath) $(libmex_la_OBJECTS) $(libmex_la_LIBADD) $(LIBS)
 libmx.la: $(libmx_la_OBJECTS) $(libmx_la_DEPENDENCIES) 
-       $(libmx_la_LINK) -rpath $(pkglibdir) $(libmx_la_OBJECTS) $(libmx_la_LIBADD) $(LIBS)
+       $(libmx_la_LINK) $(am_libmx_la_rpath) $(libmx_la_OBJECTS) $(libmx_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -838,7 +854,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -913,22 +929,22 @@ uninstall-am: uninstall-libmex_la_etcDATA \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libmex_la_etcDATA install-libmex_la_includeHEADERS \
-       install-libmex_la_rootDATA install-man install-pdf \
-       install-pdf-am install-pkglibLTLIBRARIES install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-libmex_la_etcDATA \
-       uninstall-libmex_la_includeHEADERS \
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libmex_la_etcDATA \
+       install-libmex_la_includeHEADERS install-libmex_la_rootDATA \
+       install-man install-pdf install-pdf-am \
+       install-pkglibLTLIBRARIES install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       pdf pdf-am ps ps-am tags uninstall uninstall-am \
+       uninstall-libmex_la_etcDATA uninstall-libmex_la_includeHEADERS \
        uninstall-libmex_la_rootDATA uninstall-pkglibLTLIBRARIES
 
 
index 195ead3..f979016 100644 (file)
@@ -78,8 +78,13 @@ libscioutput_stream_la_CPPFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/string/includes
 
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscioutput_stream.la
 noinst_LTLIBRARIES = libscioutput_stream-algo.la
+else
+noinst_LTLIBRARIES = libscioutput_stream-algo.la libscioutput_stream.la
+endif
+
 
 if GUI
 USEANT=1
index 87bdb10..a309722 100644 (file)
@@ -147,6 +147,8 @@ am_libscioutput_stream_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
 libscioutput_stream_algo_la_OBJECTS =  \
        $(am_libscioutput_stream_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscioutput_stream_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscioutput_stream_algo_la_rpath =
 libscioutput_stream_la_DEPENDENCIES = libscioutput_stream-algo.la
 am__objects_4 = libscioutput_stream_la-gw_output_stream.lo \
        libscioutput_stream_la-sci_print.lo \
@@ -161,6 +163,9 @@ libscioutput_stream_la_OBJECTS = $(am_libscioutput_stream_la_OBJECTS)
 libscioutput_stream_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libscioutput_stream_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscioutput_stream_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscioutput_stream_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -516,8 +521,9 @@ libscioutput_stream_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes
 
-pkglib_LTLIBRARIES = libscioutput_stream.la
-noinst_LTLIBRARIES = libscioutput_stream-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscioutput_stream.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscioutput_stream-algo.la libscioutput_stream.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscioutput_stream-algo.la
 @GUI_TRUE@USEANT = 1
 libscioutput_stream_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscioutput_stream_algo_la_SOURCES = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES) $(OUTPUT_STREAM_FORTRAN_SOURCES) $(JNI_SOURCES)
@@ -690,9 +696,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscioutput_stream-algo.la: $(libscioutput_stream_algo_la_OBJECTS) $(libscioutput_stream_algo_la_DEPENDENCIES) 
-       $(CXXLINK)  $(libscioutput_stream_algo_la_OBJECTS) $(libscioutput_stream_algo_la_LIBADD) $(LIBS)
+       $(CXXLINK) $(am_libscioutput_stream_algo_la_rpath) $(libscioutput_stream_algo_la_OBJECTS) $(libscioutput_stream_algo_la_LIBADD) $(LIBS)
 libscioutput_stream.la: $(libscioutput_stream_la_OBJECTS) $(libscioutput_stream_la_DEPENDENCIES) 
-       $(libscioutput_stream_la_LINK) -rpath $(pkglibdir) $(libscioutput_stream_la_OBJECTS) $(libscioutput_stream_la_LIBADD) $(LIBS)
+       $(libscioutput_stream_la_LINK) $(am_libscioutput_stream_la_rpath) $(libscioutput_stream_la_OBJECTS) $(libscioutput_stream_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 988c332..80046fe 100644 (file)
@@ -19,7 +19,12 @@ libsciparameters_la_CFLAGS=-I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes 
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciparameters.la
+else
+noinst_LTLIBRARIES = libsciparameters.la
+endif
+
 
 libsciparameters_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 728142f..2229cc0 100644 (file)
@@ -113,7 +113,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libparameters_la_etcdir)" \
        "$(DESTDIR)$(libparameters_la_rootdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciparameters_la_LIBADD =
 am__objects_1 = libsciparameters_la-parameters.lo
 am_libsciparameters_la_OBJECTS = $(am__objects_1)
@@ -122,6 +122,9 @@ libsciparameters_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciparameters_la_CFLAGS) $(CFLAGS) \
        $(libsciparameters_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciparameters_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciparameters_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -398,7 +401,8 @@ libsciparameters_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes 
 
-pkglib_LTLIBRARIES = libsciparameters.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciparameters.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciparameters.la
 libsciparameters_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libsciparameters_la_SOURCES = $(PARAMETERS_C_SOURCES)
 
@@ -513,6 +517,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -545,7 +558,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciparameters.la: $(libsciparameters_la_OBJECTS) $(libsciparameters_la_DEPENDENCIES) 
-       $(libsciparameters_la_LINK) -rpath $(pkglibdir) $(libsciparameters_la_OBJECTS) $(libsciparameters_la_LIBADD) $(LIBS)
+       $(libsciparameters_la_LINK) $(am_libsciparameters_la_rpath) $(libsciparameters_la_OBJECTS) $(libsciparameters_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -747,7 +760,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -822,14 +835,14 @@ uninstall-am: uninstall-libparameters_la_etcDATA \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libparameters_la_etcDATA \
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libparameters_la_etcDATA \
        install-libparameters_la_rootDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
index f57241b..7764236 100644 (file)
@@ -106,8 +106,13 @@ libscipolynomials_la_CFLAGS=       -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscipolynomials.la
 noinst_LTLIBRARIES = libscipolynomials-algo.la
+else
+noinst_LTLIBRARIES = libscipolynomials-algo.la libscipolynomials.la
+endif
+
 
 libscipolynomials_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 0905509..874f7ee 100644 (file)
@@ -124,6 +124,8 @@ am__objects_1 = residu.lo imptra.lo dmpadj.lo impins.lo dpmul1.lo \
 am_libscipolynomials_algo_la_OBJECTS = $(am__objects_1)
 libscipolynomials_algo_la_OBJECTS =  \
        $(am_libscipolynomials_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscipolynomials_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscipolynomials_algo_la_rpath =
 libscipolynomials_la_DEPENDENCIES = libscipolynomials-algo.la
 am__objects_2 = sci_f_simp.lo sci_f_poly.lo sci_f_varn.lo sci_f_sum.lo \
        sci_f_div.lo sci_f_diag.lo sci_f_prod.lo polops.lo \
@@ -152,6 +154,9 @@ libscipolynomials_la_OBJECTS = $(am_libscipolynomials_la_OBJECTS)
 libscipolynomials_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscipolynomials_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscipolynomials_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscipolynomials_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -531,8 +536,9 @@ libscipolynomials_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscipolynomials.la
-noinst_LTLIBRARIES = libscipolynomials-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscipolynomials.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscipolynomials-algo.la libscipolynomials.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscipolynomials-algo.la
 libscipolynomials_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscipolynomials_algo_la_SOURCES = $(POLYNOMIALS_FORTRAN_SOURCES)
 libscipolynomials_la_SOURCES = $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
@@ -695,9 +701,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscipolynomials-algo.la: $(libscipolynomials_algo_la_OBJECTS) $(libscipolynomials_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscipolynomials_algo_la_OBJECTS) $(libscipolynomials_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscipolynomials_algo_la_rpath) $(libscipolynomials_algo_la_OBJECTS) $(libscipolynomials_algo_la_LIBADD) $(LIBS)
 libscipolynomials.la: $(libscipolynomials_la_OBJECTS) $(libscipolynomials_la_DEPENDENCIES) 
-       $(libscipolynomials_la_LINK) -rpath $(pkglibdir) $(libscipolynomials_la_OBJECTS) $(libscipolynomials_la_LIBADD) $(LIBS)
+       $(libscipolynomials_la_LINK) $(am_libscipolynomials_la_rpath) $(libscipolynomials_la_OBJECTS) $(libscipolynomials_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 632916f..b5a92cc 100644 (file)
@@ -161,8 +161,13 @@ libscisparse_la_CFLAGS=    -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 #-Isrc/c/
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscisparse.la
 noinst_LTLIBRARIES = libscisparse-algo.la
+else
+noinst_LTLIBRARIES = libscisparse-algo.la libscisparse.la
+endif
+
 
 libscisparse_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 06be86d..98e952d 100644 (file)
@@ -135,6 +135,8 @@ am__objects_2 = spcompack.lo wsposp.lo dspmax.lo findl.lo spcho1.lo \
        ta2lpd.lo
 am_libscisparse_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscisparse_algo_la_OBJECTS = $(am_libscisparse_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscisparse_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscisparse_algo_la_rpath =
 libscisparse_la_DEPENDENCIES = libscisparse-algo.la
 am__objects_3 = libscisparse_la-sci_spcompa.lo \
        libscisparse_la-sci_full.lo libscisparse_la-sci_blkslvi.lo \
@@ -162,6 +164,8 @@ libscisparse_la_OBJECTS = $(am_libscisparse_la_OBJECTS)
 libscisparse_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscisparse_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscisparse_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscisparse_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -597,8 +601,9 @@ libscisparse_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 #-Isrc/c/
-pkglib_LTLIBRARIES = libscisparse.la
-noinst_LTLIBRARIES = libscisparse-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscisparse.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscisparse-algo.la libscisparse.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscisparse-algo.la
 libscisparse_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscisparse_algo_la_SOURCES = $(SPARSE_C_SOURCES) $(SPARSE_FORTRAN_SOURCES)
 libscisparse_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -761,9 +766,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscisparse-algo.la: $(libscisparse_algo_la_OBJECTS) $(libscisparse_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscisparse_algo_la_OBJECTS) $(libscisparse_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscisparse_algo_la_rpath) $(libscisparse_algo_la_OBJECTS) $(libscisparse_algo_la_LIBADD) $(LIBS)
 libscisparse.la: $(libscisparse_la_OBJECTS) $(libscisparse_la_DEPENDENCIES) 
-       $(libscisparse_la_LINK) -rpath $(pkglibdir) $(libscisparse_la_OBJECTS) $(libscisparse_la_LIBADD) $(LIBS)
+       $(libscisparse_la_LINK) $(am_libscisparse_la_rpath) $(libscisparse_la_OBJECTS) $(libscisparse_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 9507b9e..a5fca9a 100644 (file)
@@ -57,8 +57,13 @@ libscispecial_functions_la_CFLAGS=   -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscispecial_functions.la
 noinst_LTLIBRARIES = libscispecial_functions-algo.la
+else
+noinst_LTLIBRARIES = libscispecial_functions-algo.la libscispecial_functions.la
+endif
+
 
 libscispecial_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 276fa84..89e9cb1 100644 (file)
@@ -119,6 +119,8 @@ am_libscispecial_functions_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
 libscispecial_functions_algo_la_OBJECTS =  \
        $(am_libscispecial_functions_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscispecial_functions_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscispecial_functions_algo_la_rpath =
 libscispecial_functions_la_DEPENDENCIES =  \
        libscispecial_functions-algo.la
 am__objects_4 = libscispecial_functions_la-sci_dlgamma.lo \
@@ -145,6 +147,9 @@ libscispecial_functions_la_LINK = $(LIBTOOL) --tag=F77 \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \
        $(libscispecial_functions_la_FFLAGS) $(FFLAGS) \
        $(libscispecial_functions_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscispecial_functions_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscispecial_functions_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -476,8 +481,9 @@ libscispecial_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscispecial_functions.la
-noinst_LTLIBRARIES = libscispecial_functions-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscispecial_functions.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscispecial_functions-algo.la libscispecial_functions.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscispecial_functions-algo.la
 libscispecial_functions_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscispecial_functions_algo_la_SOURCES = $(SPECIAL_FUNCTIONS_C_SOURCES) $(SPECIAL_FUNCTIONS_FORTRAN_SOURCES) $(SPECIAL_FUNCTIONS_CPP_SOURCES)
 libscispecial_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) 
@@ -640,9 +646,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscispecial_functions-algo.la: $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscispecial_functions_algo_la_rpath) $(libscispecial_functions_algo_la_OBJECTS) $(libscispecial_functions_algo_la_LIBADD) $(LIBS)
 libscispecial_functions.la: $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_DEPENDENCIES) 
-       $(libscispecial_functions_la_LINK) -rpath $(pkglibdir) $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_LIBADD) $(LIBS)
+       $(libscispecial_functions_la_LINK) $(am_libscispecial_functions_la_rpath) $(libscispecial_functions_la_OBJECTS) $(libscispecial_functions_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 3798d0c..7b17195 100644 (file)
@@ -87,8 +87,13 @@ libscistatistics_la_CFLAGS=          -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscistatistics.la
 noinst_LTLIBRARIES = libscistatistics-algo.la
+else
+noinst_LTLIBRARIES = libscistatistics-algo.la libscistatistics.la
+endif
+
 
 libscistatistics_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 257864b..feac883 100644 (file)
@@ -127,6 +127,8 @@ am_libscistatistics_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2)
 libscistatistics_algo_la_OBJECTS =  \
        $(am_libscistatistics_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscistatistics_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscistatistics_algo_la_rpath =
 libscistatistics_la_DEPENDENCIES = libscistatistics-algo.la
 am__objects_3 = libscistatistics_la-gw_statistics.lo \
        libscistatistics_la-sci_cdfchi.lo \
@@ -146,6 +148,9 @@ libscistatistics_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscistatistics_la_CFLAGS) $(CFLAGS) \
        $(libscistatistics_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscistatistics_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscistatistics_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -508,8 +513,9 @@ libscistatistics_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscistatistics.la
-noinst_LTLIBRARIES = libscistatistics-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscistatistics.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscistatistics-algo.la libscistatistics.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscistatistics-algo.la
 libscistatistics_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscistatistics_algo_la_SOURCES = $(STATISTICS_C_SOURCES) $(STATISTICS_FORTRAN_SOURCES)
 libscistatistics_la_SOURCES = $(GATEWAY_C_SOURCES)
@@ -672,9 +678,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscistatistics-algo.la: $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_DEPENDENCIES) 
-       $(F77LINK)  $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_LIBADD) $(LIBS)
+       $(F77LINK) $(am_libscistatistics_algo_la_rpath) $(libscistatistics_algo_la_OBJECTS) $(libscistatistics_algo_la_LIBADD) $(LIBS)
 libscistatistics.la: $(libscistatistics_la_OBJECTS) $(libscistatistics_la_DEPENDENCIES) 
-       $(libscistatistics_la_LINK) -rpath $(pkglibdir) $(libscistatistics_la_OBJECTS) $(libscistatistics_la_LIBADD) $(LIBS)
+       $(libscistatistics_la_LINK) $(am_libscistatistics_la_rpath) $(libscistatistics_la_OBJECTS) $(libscistatistics_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 0646eaf..b44f35e 100644 (file)
@@ -75,8 +75,13 @@ libscistring_la_CFLAGS= $(PCRE_CFLAGS) \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscistring.la
 noinst_LTLIBRARIES = libscistring-algo.la
+else
+noinst_LTLIBRARIES = libscistring-algo.la libscistring.la
+endif
+
 
 libscistring_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(PCRE_LIBS)
 
index 454d307..3fb561b 100644 (file)
@@ -141,6 +141,8 @@ libscistring_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscistring_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscistring_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscistring_algo_la_rpath =
 libscistring_la_DEPENDENCIES = libscistring-algo.la
 am__objects_3 = libscistring_la-gw_string.lo \
        libscistring_la-sci_ascii.lo libscistring_la-sci_code2str.lo \
@@ -166,6 +168,8 @@ libscistring_la_OBJECTS = $(am_libscistring_la_OBJECTS)
 libscistring_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
        $(libscistring_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscistring_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscistring_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -511,8 +515,9 @@ libscistring_la_CFLAGS = $(PCRE_CFLAGS) \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscistring.la
-noinst_LTLIBRARIES = libscistring-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscistring.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscistring-algo.la libscistring.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscistring-algo.la
 libscistring_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(PCRE_LIBS)
 libscistring_algo_la_SOURCES = $(STRING_C_SOURCES) $(STRING_FORTRAN_SOURCES)
 libscistring_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -677,9 +682,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscistring-algo.la: $(libscistring_algo_la_OBJECTS) $(libscistring_algo_la_DEPENDENCIES) 
-       $(libscistring_algo_la_LINK)  $(libscistring_algo_la_OBJECTS) $(libscistring_algo_la_LIBADD) $(LIBS)
+       $(libscistring_algo_la_LINK) $(am_libscistring_algo_la_rpath) $(libscistring_algo_la_OBJECTS) $(libscistring_algo_la_LIBADD) $(LIBS)
 libscistring.la: $(libscistring_la_OBJECTS) $(libscistring_la_DEPENDENCIES) 
-       $(libscistring_la_LINK) -rpath $(pkglibdir) $(libscistring_la_OBJECTS) $(libscistring_la_LIBADD) $(LIBS)
+       $(libscistring_la_LINK) $(am_libscistring_la_rpath) $(libscistring_la_OBJECTS) $(libscistring_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index 7225658..401075f 100644 (file)
@@ -22,8 +22,12 @@ libscitime_la_CFLAGS=        -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscitime.la
 noinst_LTLIBRARIES = libscitime-algo.la
+else
+noinst_LTLIBRARIES = libscitime-algo.la libscitime.la
+endif
 
 libscitime_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index 151628c..0e24b5c 100644 (file)
@@ -120,6 +120,8 @@ libscitime_algo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libscitime_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscitime_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscitime_algo_la_rpath =
 libscitime_la_DEPENDENCIES = libscitime-algo.la
 am__objects_2 = libscitime_la-sci_realtime.lo \
        libscitime_la-sci_timer.lo libscitime_la-sci_calendar.lo \
@@ -130,6 +132,8 @@ libscitime_la_OBJECTS = $(am_libscitime_la_OBJECTS)
 libscitime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscitime_la_CFLAGS) \
        $(CFLAGS) $(libscitime_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscitime_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscitime_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -419,8 +423,9 @@ libscitime_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes
 
-pkglib_LTLIBRARIES = libscitime.la
-noinst_LTLIBRARIES = libscitime-algo.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscitime.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscitime-algo.la libscitime.la
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscitime-algo.la
 libscitime_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscitime_algo_la_SOURCES = $(TIME_C_SOURCES)
 libscitime_la_SOURCES = $(GATEWAY_C_SOURCES)
@@ -589,9 +594,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscitime-algo.la: $(libscitime_algo_la_OBJECTS) $(libscitime_algo_la_DEPENDENCIES) 
-       $(libscitime_algo_la_LINK)  $(libscitime_algo_la_OBJECTS) $(libscitime_algo_la_LIBADD) $(LIBS)
+       $(libscitime_algo_la_LINK) $(am_libscitime_algo_la_rpath) $(libscitime_algo_la_OBJECTS) $(libscitime_algo_la_LIBADD) $(LIBS)
 libscitime.la: $(libscitime_la_OBJECTS) $(libscitime_la_DEPENDENCIES) 
-       $(libscitime_la_LINK) -rpath $(pkglibdir) $(libscitime_la_OBJECTS) $(libscitime_la_LIBADD) $(LIBS)
+       $(libscitime_la_LINK) $(am_libscitime_la_rpath) $(libscitime_la_OBJECTS) $(libscitime_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
index ae6a7cc..69a89fb 100644 (file)
@@ -15,7 +15,12 @@ libsciwindows_tools_la_CFLAGS=  -I$(srcdir)/includes/ \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
+
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libsciwindows_tools.la
+else
+noinst_LTLIBRARIES = libsciwindows_tools.la
+endif
 
 libsciwindows_tools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
index dafc34b..27e771e 100644 (file)
@@ -108,7 +108,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciwindows_tools_la_etcdir)" \
        "$(DESTDIR)$(libsciwindows_tools_la_rootdir)" \
        "$(DESTDIR)$(libsciwindows_tools_la_sci_gatewaydir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciwindows_tools_la_LIBADD =
 am__objects_1 = libsciwindows_tools_la-nowindows_tools.lo
 am_libsciwindows_tools_la_OBJECTS = $(am__objects_1)
@@ -117,6 +117,9 @@ libsciwindows_tools_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciwindows_tools_la_CFLAGS) $(CFLAGS) \
        $(libsciwindows_tools_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libsciwindows_tools_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libsciwindows_tools_la_rpath = -rpath \
+@MAINTAINER_MODE_TRUE@ $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -400,7 +403,8 @@ libsciwindows_tools_la_CFLAGS = -I$(srcdir)/includes/ \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
-pkglib_LTLIBRARIES = libsciwindows_tools.la
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciwindows_tools.la
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciwindows_tools.la
 libsciwindows_tools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libsciwindows_tools.la
@@ -517,6 +521,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@@ -549,7 +562,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciwindows_tools.la: $(libsciwindows_tools_la_OBJECTS) $(libsciwindows_tools_la_DEPENDENCIES) 
-       $(libsciwindows_tools_la_LINK) -rpath $(pkglibdir) $(libsciwindows_tools_la_OBJECTS) $(libsciwindows_tools_la_LIBADD) $(LIBS)
+       $(libsciwindows_tools_la_LINK) $(am_libsciwindows_tools_la_rpath) $(libsciwindows_tools_la_OBJECTS) $(libsciwindows_tools_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -771,7 +784,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -849,14 +862,14 @@ uninstall-am: uninstall-libsciwindows_tools_la_etcDATA \
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
        clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libsciwindows_tools_la_etcDATA \
+       clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-local distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libsciwindows_tools_la_etcDATA \
        install-libsciwindows_tools_la_rootDATA \
        install-libsciwindows_tools_la_sci_gatewayDATA install-man \
        install-pdf install-pdf-am install-pkglibLTLIBRARIES \
index d533b27..276b552 100644 (file)
@@ -21,18 +21,17 @@ libscixml_la_root_DATA =  license.txt
 #### scinotes : init scripts & configuration files ####
 libscixml_la_etcdir = $(mydatadir)/etc
 libscixml_la_etc_DATA = etc/xml.quit \
-                               etc/xml.start
+                etc/xml.start
 
 include $(top_srcdir)/Makefile.incl.am
 
-
 XML_JNI_SOURCES = 
 
 XML_C_SOURCES = src/c/XMLMlistsManagement.c
 
 XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
-                 src/cpp/XMLObject.cpp \
-                 src/cpp/XMLDocument.cpp \
+          src/cpp/XMLObject.cpp \
+          src/cpp/XMLDocument.cpp \
           src/cpp/XMLElement.cpp \
           src/cpp/XMLAttr.cpp \
           src/cpp/XMLNs.cpp \
@@ -42,9 +41,9 @@ XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
           src/cpp/XMLList.cpp \
           src/cpp/XMLNotHandledElement.cpp \
           src/cpp/XMLValidation.cpp \
-                 src/cpp/XMLValidationDTD.cpp \
-                 src/cpp/XMLValidationSchema.cpp \
-                 src/cpp/XMLValidationRelaxNG.cpp
+          src/cpp/XMLValidationDTD.cpp \
+          src/cpp/XMLValidationSchema.cpp \
+          src/cpp/XMLValidationRelaxNG.cpp
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_xml.c
 
@@ -83,12 +82,12 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_xmlSetAttributes.cpp
 
 libscixml_la_CFLAGS= -I$(srcdir)/includes/ \
-                    -I$(top_srcdir)/libs/MALLOC/includes/ \
-                     -I$(top_srcdir)/modules/core/includes \
-                    -I$(top_srcdir)/modules/api_scilab/includes \
-                    -I$(top_srcdir)/modules/output_stream/includes \
-                    -I$(top_srcdir)/modules/string/includes \
-                    -I$(top_srcdir)/modules/fileio/includes
+             -I$(top_srcdir)/libs/MALLOC/includes/ \
+             -I$(top_srcdir)/modules/core/includes \
+             -I$(top_srcdir)/modules/api_scilab/includes \
+             -I$(top_srcdir)/modules/output_stream/includes \
+             -I$(top_srcdir)/modules/string/includes \
+             -I$(top_srcdir)/modules/fileio/includes
 
 
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
@@ -100,8 +99,12 @@ libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/fileio/includes \
     $(XML_FLAGS)
 
+if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscixml.la 
 noinst_LTLIBRARIES = libscixml-algo.la 
+else
+noinst_LTLIBRARIES = libscixml-algo.la libscixml.la 
+endif
 
 libscixml_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
 
index e3f5093..1de014a 100644 (file)
@@ -133,6 +133,8 @@ am__objects_3 = libscixml_algo_la-VariableScope.lo \
 am_libscixml_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_3)
 libscixml_algo_la_OBJECTS = $(am_libscixml_algo_la_OBJECTS)
+@MAINTAINER_MODE_FALSE@am_libscixml_algo_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscixml_algo_la_rpath =
 libscixml_la_DEPENDENCIES = libscixml-algo.la
 am__objects_4 = libscixml_la-gw_xml.lo
 am__objects_5 = libscixml_la-sci_xmlRead.lo \
@@ -166,6 +168,8 @@ libscixml_la_OBJECTS = $(am_libscixml_la_OBJECTS)
 libscixml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libscixml_la_LDFLAGS) $(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am_libscixml_la_rpath =
+@MAINTAINER_MODE_TRUE@am_libscixml_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -454,7 +458,7 @@ libscixml_la_root_DATA = license.txt
 #### scinotes : init scripts & configuration files ####
 libscixml_la_etcdir = $(mydatadir)/etc
 libscixml_la_etc_DATA = etc/xml.quit \
-                               etc/xml.start
+                etc/xml.start
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
@@ -522,8 +526,8 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 XML_JNI_SOURCES = 
 XML_C_SOURCES = src/c/XMLMlistsManagement.c
 XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
-                 src/cpp/XMLObject.cpp \
-                 src/cpp/XMLDocument.cpp \
+          src/cpp/XMLObject.cpp \
+          src/cpp/XMLDocument.cpp \
           src/cpp/XMLElement.cpp \
           src/cpp/XMLAttr.cpp \
           src/cpp/XMLNs.cpp \
@@ -533,9 +537,9 @@ XML_CPP_SOURCES = src/cpp/VariableScope.cpp \
           src/cpp/XMLList.cpp \
           src/cpp/XMLNotHandledElement.cpp \
           src/cpp/XMLValidation.cpp \
-                 src/cpp/XMLValidationDTD.cpp \
-                 src/cpp/XMLValidationSchema.cpp \
-                 src/cpp/XMLValidationRelaxNG.cpp
+          src/cpp/XMLValidationDTD.cpp \
+          src/cpp/XMLValidationSchema.cpp \
+          src/cpp/XMLValidationRelaxNG.cpp
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_xml.c
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
@@ -573,12 +577,12 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_xmlSetAttributes.cpp
 
 libscixml_la_CFLAGS = -I$(srcdir)/includes/ \
-                    -I$(top_srcdir)/libs/MALLOC/includes/ \
-                     -I$(top_srcdir)/modules/core/includes \
-                    -I$(top_srcdir)/modules/api_scilab/includes \
-                    -I$(top_srcdir)/modules/output_stream/includes \
-                    -I$(top_srcdir)/modules/string/includes \
-                    -I$(top_srcdir)/modules/fileio/includes
+             -I$(top_srcdir)/libs/MALLOC/includes/ \
+             -I$(top_srcdir)/modules/core/includes \
+             -I$(top_srcdir)/modules/api_scilab/includes \
+             -I$(top_srcdir)/modules/output_stream/includes \
+             -I$(top_srcdir)/modules/string/includes \
+             -I$(top_srcdir)/modules/fileio/includes
 
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
@@ -589,8 +593,9 @@ libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/fileio/includes \
     $(XML_FLAGS)
 
-pkglib_LTLIBRARIES = libscixml.la 
-noinst_LTLIBRARIES = libscixml-algo.la 
+@MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscixml.la 
+@MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscixml-algo.la libscixml.la 
+@MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscixml-algo.la 
 libscixml_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
 libscixml_algo_la_SOURCES = $(XML_C_SOURCES) $(XML_JNI_SOURCES) $(XML_CPP_SOURCES)
 libscixml_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) 
@@ -683,9 +688,9 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscixml-algo.la: $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_DEPENDENCIES) 
-       $(CXXLINK)  $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_LIBADD) $(LIBS)
+       $(CXXLINK) $(am_libscixml_algo_la_rpath) $(libscixml_algo_la_OBJECTS) $(libscixml_algo_la_LIBADD) $(LIBS)
 libscixml.la: $(libscixml_la_OBJECTS) $(libscixml_la_DEPENDENCIES) 
-       $(libscixml_la_LINK) -rpath $(pkglibdir) $(libscixml_la_OBJECTS) $(libscixml_la_LIBADD) $(LIBS)
+       $(libscixml_la_LINK) $(am_libscixml_la_rpath) $(libscixml_la_OBJECTS) $(libscixml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)