Beginning of the VPATH management
Sylvestre Ledru [Sat, 13 Sep 2008 15:51:30 +0000 (15:51 +0000)]
107 files changed:
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/libs/doublylinkedlist/Makefile.am
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.am
scilab/libs/dynamiclibrary/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/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/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/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/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/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/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.am
scilab/modules/sound/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/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in

index a727df1..cbc10f1 100644 (file)
@@ -167,7 +167,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
                [$4])
 else
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
index 6c4dde2..4e194fc 100755 (executable)
@@ -10659,8 +10659,8 @@ fi
 
 
 # flag for possible compilations in configure
-CFLAGS="$CFLAGS "'-I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
-CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
+CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
+CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
 FFLAGS="$FFLAGS "'-I$(top_srcdir)/modules/core/includes/'
 
 if test $IS_64_BITS_CPU = true; then
@@ -25536,7 +25536,7 @@ Alternatively, you may set the environment variables MATIO_CFLAGS
 and MATIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -25546,7 +25546,7 @@ Alternatively, you may set the environment variables MATIO_CFLAGS
 and MATIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
index 51cb3c2..e85fec8 100644 (file)
@@ -503,8 +503,8 @@ fi
 
 
 # flag for possible compilations in configure
-CFLAGS="$CFLAGS "'-I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
-CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
+CFLAGS="$CFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
+CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/'
 FFLAGS="$FFLAGS "'-I$(top_srcdir)/modules/core/includes/'
 
 if test $IS_64_BITS_CPU = true; then
index a597eef..b6af6e7 100644 (file)
@@ -9,7 +9,7 @@ libscidoublylinkedlist_la_includedir=$(pkgincludedir)/doublylinkedlist
 
 libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
 
-libscidoublylinkedlist_la_CFLAGS= -Isrc/ -Iincludes/
+libscidoublylinkedlist_la_CFLAGS= -I$(srcdir)/src/ -I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidoublylinkedlist.la
 
index 2f34fec..4f57ec8 100644 (file)
@@ -309,7 +309,7 @@ top_srcdir = @top_srcdir@
 DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
 libscidoublylinkedlist_la_includedir = $(pkgincludedir)/doublylinkedlist
 libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
-libscidoublylinkedlist_la_CFLAGS = -Isrc/ -Iincludes/
+libscidoublylinkedlist_la_CFLAGS = -I$(srcdir)/src/ -I$(srcdir)/includes/
 pkglib_LTLIBRARIES = libscidoublylinkedlist.la
 libscidoublylinkedlist_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscidoublylinkedlist_la_SOURCES = $(DOUBLYLINKEDLIST_C_SOURCES)
index 8768c99..bf40a41 100644 (file)
@@ -10,7 +10,7 @@ libscidynamiclibrary_la_includedir=$(pkgincludedir)/dynamiclibrary
 libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
 
-libscidynamiclibrary_la_CFLAGS= -Isrc/ -Iincludes/
+libscidynamiclibrary_la_CFLAGS= -Isrc/ -I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamiclibrary.la
 
index b66c49d..e21f742 100644 (file)
@@ -311,7 +311,7 @@ libscidynamiclibrary_la_includedir = $(pkgincludedir)/dynamiclibrary
 libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
 
-libscidynamiclibrary_la_CFLAGS = -Isrc/ -Iincludes/
+libscidynamiclibrary_la_CFLAGS = -Isrc/ -I$(srcdir)/includes/
 pkglib_LTLIBRARIES = libscidynamiclibrary.la
 libscidynamiclibrary_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscidynamiclibrary_la_SOURCES = $(DYNAMICLIBRARY_C_SOURCES)
index 26d89a9..8d7e32c 100644 (file)
@@ -34,9 +34,9 @@ endif
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
--Iincludes/ \
--Isrc/c/ \
--Isrc/jni/ \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/jni/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes
 
index 20d8b1a..3c76f96 100644 (file)
@@ -354,9 +354,9 @@ top_srcdir = @top_srcdir@
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
--Iincludes/ \
--Isrc/c/ \
--Isrc/jni/ \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/jni/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes
 
index 8bad4ca..fcf1ecc 100644 (file)
@@ -65,10 +65,10 @@ sci_gateway/c/sci_dsaupd.c \
 sci_gateway/c/sci_znaupd.c
 
 libsciarnoldi_la_CFLAGS=       -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -Iincludes/ \
+                               -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
-libsciarnoldi_la_FFLAGS= -Isrc/arpack/
+libsciarnoldi_la_FFLAGS= -I$(srcdir)/src/arpack/
 
 pkglib_LTLIBRARIES = libsciarnoldi.la
 
index fba8b89..226702b 100644 (file)
@@ -414,10 +414,10 @@ sci_gateway/c/sci_dsaupd.c \
 sci_gateway/c/sci_znaupd.c
 
 libsciarnoldi_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -Iincludes/ \
+                               -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
-libsciarnoldi_la_FFLAGS = -Isrc/arpack/
+libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/
 pkglib_LTLIBRARIES = libsciarnoldi.la
 libsciarnoldi_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
index f9fa70c..fbb2600 100644 (file)
@@ -19,9 +19,9 @@ sci_gateway/c/gw_boolean.c
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_bool2s.f \
 sci_gateway/fortran/sci_find.f
 
-libsciboolean_la_CFLAGS=       -Iincludes/ \
-                               -Isrc/c/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libsciboolean_la_CFLAGS=       -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la
 
index 5230714..9b193b5 100644 (file)
@@ -347,9 +347,9 @@ sci_gateway/c/gw_boolean.c
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_bool2s.f \
 sci_gateway/fortran/sci_find.f
 
-libsciboolean_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libsciboolean_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la
 libsciboolean_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 5032d22..2574f73 100644 (file)
@@ -212,9 +212,9 @@ sci_gateway/fortran/sci_f_gspec.f \
 sci_gateway/fortran/sci_f_linmeq.f \
 sci_gateway/fortran/sci_f_rankqr.f
 
-libscicacsd_la_FFLAGS= -Iincludes/
-libscicacsd_la_CFLAGS=         -Iincludes/ \
-                       -I$(top_builddir)/modules/output_stream/includes/
+libscicacsd_la_FFLAGS= -I$(srcdir)/includes/
+libscicacsd_la_CFLAGS=         -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscicacsd.la
 
index 237252b..2547a3a 100644 (file)
@@ -638,9 +638,9 @@ sci_gateway/fortran/sci_f_gspec.f \
 sci_gateway/fortran/sci_f_linmeq.f \
 sci_gateway/fortran/sci_f_rankqr.f
 
-libscicacsd_la_FFLAGS = -Iincludes/
-libscicacsd_la_CFLAGS = -Iincludes/ \
-                       -I$(top_builddir)/modules/output_stream/includes/
+libscicacsd_la_FFLAGS = -I$(srcdir)/includes/
+libscicacsd_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscicacsd.la
 libscicacsd_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)  $(ATLAS_LIBS)
index cf2f4aa..4c4089a 100644 (file)
@@ -29,8 +29,8 @@ sci_gateway/c/gw_completion.c
 
 # Includes need for the compilation
 libscicompletion_la_CFLAGS=    $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/c/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
index 9d9a01e..581cea8 100644 (file)
@@ -361,8 +361,8 @@ sci_gateway/c/gw_completion.c
 
 # Includes need for the compilation
 libscicompletion_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/c/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
index 740b24a..5426c34 100644 (file)
@@ -49,7 +49,7 @@ CONSOLE_C_SOURCES = src/noconsole/noconsole.c
 endif
 
 # Includes need for the compilation
-libsciconsole_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ -Isrc/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
+libsciconsole_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
 
 # Includes need for the compilation
 libsciconsole_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
index 8e2b663..98ecd65 100644 (file)
@@ -382,7 +382,7 @@ top_srcdir = @top_srcdir@
 @GUI_TRUE@BUILT_SOURCES = $(am__append_1) $(am__append_2)
 
 # Includes need for the compilation
-libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ -Isrc/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
+libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
 
 # Includes need for the compilation
 libsciconsole_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
index 0fd38f9..a686598 100644 (file)
@@ -302,8 +302,8 @@ sci_gateway/fortran/sci_mode.f \
 sci_gateway/fortran/sci_debug.f \
 sci_gateway/fortran/sci_isglobal.f
 
-libscicore_la_CFLAGS=          -Iincludes/ \
-                       -Isrc/c/ \
+libscicore_la_CFLAGS=          -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
             -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
                        -I$(top_srcdir)/libs/doublylinkedlist/includes \
index 63e8339..74dd7ea 100644 (file)
@@ -742,7 +742,7 @@ sci_gateway/fortran/sci_mode.f \
 sci_gateway/fortran/sci_debug.f \
 sci_gateway/fortran/sci_isglobal.f
 
-libscicore_la_CFLAGS = -Iincludes/ -Isrc/c/ \
+libscicore_la_CFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
        -I$(top_srcdir)/libs/doublylinkedlist/includes \
index 8800938..8167321 100644 (file)
@@ -41,7 +41,7 @@ sci_gateway/fortran/sci_getfield.f \
 sci_gateway/fortran/sci_lstcat.f \
 sci_gateway/fortran/sci_list.f
 
-libscidata_structures_la_CFLAGS=       -Iincludes/ \
+libscidata_structures_la_CFLAGS=       -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
                     -I$(top_srcdir)/modules/string/includes
index b7ce0ba..c49c388 100644 (file)
@@ -386,7 +386,7 @@ sci_gateway/fortran/sci_getfield.f \
 sci_gateway/fortran/sci_lstcat.f \
 sci_gateway/fortran/sci_list.f
 
-libscidata_structures_la_CFLAGS = -Iincludes/ \
+libscidata_structures_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
                     -I$(top_srcdir)/modules/string/includes
index 0c17702..1a55164 100644 (file)
@@ -216,9 +216,9 @@ demos/wheel/wheel2.dem.sce \
 demos/wheel/x.wrt
 
 
-libscidifferential_equations_la_CFLAGS=        -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscidifferential_equations_la_CFLAGS=        -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
 
index e8a7388..d5b47e2 100644 (file)
@@ -588,9 +588,9 @@ demos/wheel/wheel1.dem.sce \
 demos/wheel/wheel2.dem.sce \
 demos/wheel/x.wrt
 
-libscidifferential_equations_la_CFLAGS = -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscidifferential_equations_la_CFLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
 libscidifferential_equations_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 4766f41..4c645d8 100644 (file)
@@ -1,3 +1,7 @@
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006
+##########
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_double.c
 
index 99587ff..58d856e 100644 (file)
 
 @SET_MAKE@
 
+##########
+### Sylvestre Ledru <sylvestre.ledru@inria.fr>
+### INRIA - Scilab 2006
+##########
+
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 # Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
index cb56693..ae9c2bd 100644 (file)
@@ -22,8 +22,8 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/fileio/includes \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
--Isrc/c/ \
--Iincludes/
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamic_link.la
 
index b1d7e34..51f7990 100644 (file)
@@ -364,8 +364,8 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/fileio/includes \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
--Isrc/c/ \
--Iincludes/
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamic_link.la
 libscidynamic_link_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index caa0f0b..274fdf4 100644 (file)
@@ -363,22 +363,24 @@ libdummy_elementary_functions_la_FFLAGS = $(FFLAGS:-O%=)
 
 
 
-libdummy_elementary_functions_la_CFLAGS = $(CFLAGS:-O%=) -I$(top_srcdir)/modules/core/includes/ -Iincludes/
+libdummy_elementary_functions_la_CFLAGS = $(CFLAGS:-O%=) \
+       -I$(top_srcdir)/modules/core/includes/ \
+       -I$(srcdir)/includes/
 
 # Includes need for the compilation
-libscielementary_functions_la_FFLAGS= -Iincludes/
+libscielementary_functions_la_FFLAGS= -I$(srcdir)/includes/
 
 # Includes need for the compilation
-libscielementary_functions_la_CPPFLAGS =       -Iincludes/ \
-       -Isrc/cpp/ \
-       -Isrc/c/ \
+libscielementary_functions_la_CPPFLAGS =       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes
 
 # Includes need for the compilation
-libscielementary_functions_la_CFLAGS=  -Iincludes/ \
+libscielementary_functions_la_CFLAGS=  -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
--Isrc/c/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscielementary_functions.la
@@ -403,7 +405,7 @@ libdummy_elementary_functions_la-pade.lo: src/fortran/pade.f
        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(libdummy_elementary_functions_la_FFLAGS) -c -o libdummy_elementary_functions_la-pade.lo `test -f 'src/fortran/pade.f' || echo '$(srcdir)/'`src/fortran/pade.f
 
 libdummy_elementary_functions_la-unsfdcopy.lo: src/c/unsfdcopy.c
-       $(LIBTOOL) --tag=CC --mode=compile $(CC) $(libdummy_elementary_functions_la_CFLAGS) -c -o libdummy_elementary_functions_la-unsfdcopy.lo `test -f 'src/c/unsfdcopy.c' || echo '$(srcdir)/'`src/c/unsfdcopy.c
+       $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFAULT_INCLUDES) $(libdummy_elementary_functions_la_CFLAGS) -c -o libdummy_elementary_functions_la-unsfdcopy.lo `test -f 'src/c/unsfdcopy.c' || echo '$(srcdir)/'`src/c/unsfdcopy.c
 
 
 libdummy_elementary_functions_la-icopy.lo: src/fortran/icopy.f
index 82ab0cd..ae273d9 100644 (file)
@@ -1045,23 +1045,26 @@ libdummy_elementary_functions_la_SOURCES = src/fortran/hqror2.f \
        src/fortran/icopy.f
 
 libdummy_elementary_functions_la_FFLAGS = $(FFLAGS:-O%=)
-libdummy_elementary_functions_la_CFLAGS = $(CFLAGS:-O%=) -I$(top_srcdir)/modules/core/includes/ -Iincludes/
+libdummy_elementary_functions_la_CFLAGS = $(CFLAGS:-O%=) \
+       -I$(top_srcdir)/modules/core/includes/ \
+       -I$(srcdir)/includes/
+
 
 # Includes need for the compilation
-libscielementary_functions_la_FFLAGS = -Iincludes/
+libscielementary_functions_la_FFLAGS = -I$(srcdir)/includes/
 
 # Includes need for the compilation
-libscielementary_functions_la_CPPFLAGS = -Iincludes/ \
-       -Isrc/cpp/ \
-       -Isrc/c/ \
+libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes
 
 
 # Includes need for the compilation
-libscielementary_functions_la_CFLAGS = -Iincludes/ \
+libscielementary_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
--Isrc/c/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscielementary_functions.la
@@ -2941,7 +2944,7 @@ libdummy_elementary_functions_la-pade.lo: src/fortran/pade.f
        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(libdummy_elementary_functions_la_FFLAGS) -c -o libdummy_elementary_functions_la-pade.lo `test -f 'src/fortran/pade.f' || echo '$(srcdir)/'`src/fortran/pade.f
 
 libdummy_elementary_functions_la-unsfdcopy.lo: src/c/unsfdcopy.c
-       $(LIBTOOL) --tag=CC --mode=compile $(CC) $(libdummy_elementary_functions_la_CFLAGS) -c -o libdummy_elementary_functions_la-unsfdcopy.lo `test -f 'src/c/unsfdcopy.c' || echo '$(srcdir)/'`src/c/unsfdcopy.c
+       $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFAULT_INCLUDES) $(libdummy_elementary_functions_la_CFLAGS) -c -o libdummy_elementary_functions_la-unsfdcopy.lo `test -f 'src/c/unsfdcopy.c' || echo '$(srcdir)/'`src/c/unsfdcopy.c
 
 libdummy_elementary_functions_la-icopy.lo: src/fortran/icopy.f
        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(libdummy_elementary_functions_la_FFLAGS) -c -o libdummy_elementary_functions_la-icopy.lo `test -f 'src/fortran/icopy.f' || echo '$(srcdir)/'`src/fortran/icopy.f
index 73f5d32..0b53b6b 100644 (file)
@@ -49,8 +49,8 @@ libscifftw_la_sci_gateway_DATA = sci_gateway/fftw_gateway.xml
 libscifftw_la_SOURCES = $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
 
 libscifftw_la_LIBADD =  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
-libscifftw_la_CFLAGS=          -Iincludes/ \
-                       -Isrc/c/ \
+libscifftw_la_CFLAGS=          -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        $(FFTW3_CFLAGS)
index 69d1df4..f1eefae 100644 (file)
@@ -392,8 +392,8 @@ libscifftw_la_etc_DATA = etc/fftw.quit etc/fftw.start
 @FFTW_TRUE@libscifftw_la_SOURCES = $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
 @FFTW_TRUE@libscifftw_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
 @FFTW_FALSE@libscifftw_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
-@FFTW_TRUE@libscifftw_la_CFLAGS = -Iincludes/ \
-@FFTW_TRUE@                    -Isrc/c/ \
+@FFTW_TRUE@libscifftw_la_CFLAGS = -I$(srcdir)/includes/ \
+@FFTW_TRUE@                    -I$(srcdir)/src/c/ \
 @FFTW_TRUE@                    -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 @FFTW_TRUE@                    -I$(top_srcdir)/modules/output_stream/includes \
 @FFTW_TRUE@                    $(FFTW3_CFLAGS)
index 167f608..7d3e9c5 100644 (file)
@@ -69,8 +69,8 @@ sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_createdir.c
 
-libscifileio_la_CFLAGS=                -Iincludes/ \
-                               -Isrc/c/ \
+libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                 -I$(top_srcdir)/modules/string/includes
index 5503961..f91a571 100644 (file)
@@ -425,8 +425,8 @@ sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_createdir.c
 
-libscifileio_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
+libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                 -I$(top_srcdir)/modules/string/includes
index dcae24f..27d70d2 100644 (file)
@@ -35,10 +35,10 @@ sci_gateway/c/sci_xs2pdf.c
 
 # Includes need for the compilation
 libscigraphic_export_la_CPPFLAGS =     $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/cpp/ \
-                               -Isrc/jni/ \
-                               -Isrc/c/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/cpp/ \
+                               -I$(srcdir)/src/jni/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/modules/jvm/includes \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/renderer/includes/ \
index 164cbfe..977ebe1 100644 (file)
@@ -399,10 +399,10 @@ top_srcdir = @top_srcdir@
 
 # Includes need for the compilation
 @GUI_TRUE@libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-@GUI_TRUE@                             -Iincludes/ \
-@GUI_TRUE@                             -Isrc/cpp/ \
-@GUI_TRUE@                             -Isrc/jni/ \
-@GUI_TRUE@                             -Isrc/c/ \
+@GUI_TRUE@                             -I$(srcdir)/includes/ \
+@GUI_TRUE@                             -I$(srcdir)/src/cpp/ \
+@GUI_TRUE@                             -I$(srcdir)/src/jni/ \
+@GUI_TRUE@                             -I$(srcdir)/src/c/ \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/jvm/includes \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/graphics/includes/ \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/renderer/includes/ \
index 365cb83..3beacae 100644 (file)
@@ -6,9 +6,9 @@
 # the module Doublylinkedlist  is included here... of course, it is not
 # used in the mode without gui but It causes some silly problems with includes
 libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes \
-       -Iincludes/ \
-       -Isrc/c/ \
-       -Isrc/c/getHandleProperty/ \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/
index b3706bb..0193c63 100644 (file)
@@ -1109,8 +1109,9 @@ top_srcdir = @top_srcdir@
 # the module Doublylinkedlist  is included here... of course, it is not
 # used in the mode without gui but It causes some silly problems with includes
 libscigraphics_la_CFLAGS =  \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes -Iincludes/ \
-       -Isrc/c/ -Isrc/c/getHandleProperty/ \
+       -I$(top_srcdir)/libs/doublylinkedlist/includes \
+       -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/ $(am__append_1) \
index 9c1191f..ab79cb5 100644 (file)
@@ -157,9 +157,9 @@ sci_gateway/cpp/sci_setlookandfeel.cpp \
 sci_gateway/cpp/sci_getinstalledlookandfeels.cpp \
 sci_gateway/cpp/sci_getlookandfeel.cpp
 
-libscigui_la_CFLAGS=   -Isrc/c/ \
-                       -Isrc/c/xsci/ \
-                       -Iincludes/ \
+libscigui_la_CFLAGS=   -I$(srcdir)/src/c/ \
+                       -I$(srcdir)/src/c/xsci/ \
+                       -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/core/src/c/ \
@@ -173,7 +173,7 @@ libscigui_la_CFLAGS=        -Isrc/c/ \
                        -I$(top_srcdir)/libs/hashtable \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/dynamic_link/includes \
-                       -Isrc/cpp/ \
+                       -I$(srcdir)/src/cpp/ \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/
 
 libscigui_la_CFLAGS += $(JAVA_JNI_INCLUDE) \
@@ -181,10 +181,10 @@ libscigui_la_CFLAGS += $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/string/includes/
 
 libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                       -Iincludes/ \
-                       -Isrc/cpp/ \
-                       -Isrc/c/ \
-                       -Isrc/jni/ \
+                       -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/cpp/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/renderer/src/jni/ \
                        -I$(top_srcdir)/modules/renderer/includes/ \
index 1a3c8e1..a1d0818 100644 (file)
@@ -738,7 +738,8 @@ HELP_CHAPTERFILE = addchapter.sce
 @GUI_FALSE@libscigui_la_CFLAGS = -Iincludes/ \
 @GUI_FALSE@                    -I$(top_srcdir)/modules/output_stream/includes
 
-@GUI_TRUE@libscigui_la_CFLAGS = -Isrc/c/ -Isrc/c/xsci/ -Iincludes/ \
+@GUI_TRUE@libscigui_la_CFLAGS = -I$(srcdir)/src/c/ \
+@GUI_TRUE@     -I$(srcdir)/src/c/xsci/ -I$(srcdir)/includes/ \
 @GUI_TRUE@     -I$(top_srcdir)/modules/graphics/includes/ \
 @GUI_TRUE@     -I$(top_srcdir)/libs/MALLOC/includes/ \
 @GUI_TRUE@     -I$(top_srcdir)/modules/core/src/c/ \
@@ -751,16 +752,16 @@ HELP_CHAPTERFILE = addchapter.sce
 @GUI_TRUE@     -I$(top_srcdir)/libs/hashtable \
 @GUI_TRUE@     -I$(top_srcdir)/modules/output_stream/includes \
 @GUI_TRUE@     -I$(top_srcdir)/modules/dynamic_link/includes \
-@GUI_TRUE@     -Isrc/cpp/ \
+@GUI_TRUE@     -I$(srcdir)/src/cpp/ \
 @GUI_TRUE@     -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
 @GUI_TRUE@     $(JAVA_JNI_INCLUDE) \
 @GUI_TRUE@     -I$(top_srcdir)/modules/jvm/includes/ \
 @GUI_TRUE@     -I$(top_srcdir)/modules/string/includes/
 @GUI_TRUE@libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-@GUI_TRUE@                     -Iincludes/ \
-@GUI_TRUE@                     -Isrc/cpp/ \
-@GUI_TRUE@                     -Isrc/c/ \
-@GUI_TRUE@                     -Isrc/jni/ \
+@GUI_TRUE@                     -I$(srcdir)/includes/ \
+@GUI_TRUE@                     -I$(srcdir)/src/cpp/ \
+@GUI_TRUE@                     -I$(srcdir)/src/c/ \
+@GUI_TRUE@                     -I$(srcdir)/src/jni/ \
 @GUI_TRUE@                     -I$(top_srcdir)/modules/jvm/includes/ \
 @GUI_TRUE@                     -I$(top_srcdir)/modules/renderer/src/jni/ \
 @GUI_TRUE@                     -I$(top_srcdir)/modules/renderer/includes/ \
index 610d0f4..dfd06f7 100644 (file)
@@ -22,13 +22,13 @@ endif
 
 pkglib_LTLIBRARIES = libscihelptools.la
 
-libscihelptools_la_CFLAGS=     -Iincludes/ 
+libscihelptools_la_CFLAGS=     -I$(srcdir)/includes/ 
 
 libscihelptools_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
-                               -Isrc/jni/ \
-                               -Iincludes/ \
+                               -I$(srcdir)/src/jni/ \
+                               -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes \
-                               -I$(top_builddir)/modules/output_stream/includes/
+                               -I$(top_srcdir)/modules/output_stream/includes/
 
 libscihelptools_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
index 9fed78d..7f70a05 100644 (file)
@@ -372,12 +372,12 @@ top_srcdir = @top_srcdir@
 @GUI_TRUE@GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml
 @GIWS_TRUE@@GUI_TRUE@BUILT_SOURCES = giws
 pkglib_LTLIBRARIES = libscihelptools.la
-libscihelptools_la_CFLAGS = -Iincludes/ 
+libscihelptools_la_CFLAGS = -I$(srcdir)/includes/ 
 libscihelptools_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                               -Isrc/jni/ \
-                               -Iincludes/ \
+                               -I$(srcdir)/src/jni/ \
+                               -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes \
-                               -I$(top_builddir)/modules/output_stream/includes/
+                               -I$(top_srcdir)/modules/output_stream/includes/
 
 libscihelptools_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscihelptools_la_SOURCES = $(GATEWAY_C_SOURCES) $(HELPTOOLS_SOURCES)
index c5af500..7eb1e3e 100644 (file)
@@ -41,12 +41,12 @@ endif
 
 
 # Includes need for the compilation
-libscihistory_manager_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/
+libscihistory_manager_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/
 
 # Includes need for the compilation
 libscihistory_manager_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
--Iincludes/ \
--Isrc/c/ \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/history_manager/includes/ \
index 2a6b18c..46e75d3 100644 (file)
@@ -402,12 +402,12 @@ sci_gateway/c/sci_historymanager.c
 @GUI_TRUE@USEANT = 1
 
 # Includes need for the compilation
-libscihistory_manager_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/
+libscihistory_manager_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/
 
 # Includes need for the compilation
 libscihistory_manager_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
--Iincludes/ \
--Isrc/c/ \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/history_manager/includes/ \
index 0414271..71c1c67 100644 (file)
@@ -114,8 +114,8 @@ sci_gateway/fortran/sci_i_triu.f \
 sci_gateway/fortran/sci_i_min.f \
 sci_gateway/fortran/sci_inttype.f
 
-libsciinteger_la_CFLAGS=       -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes/
+libsciinteger_la_CFLAGS=       -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libsciinteger.la
 
index 3b159ac..97055c8 100644 (file)
@@ -474,8 +474,8 @@ sci_gateway/fortran/sci_i_triu.f \
 sci_gateway/fortran/sci_i_min.f \
 sci_gateway/fortran/sci_inttype.f
 
-libsciinteger_la_CFLAGS = -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes/
+libsciinteger_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libsciinteger.la
 libsciinteger_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index e09dc9d..8b88f9b 100644 (file)
@@ -29,9 +29,9 @@ sci_gateway/c/sci_splin3d.c \
 sci_gateway/c/sci_bsplin3val.c \
 sci_gateway/c/sci_eval_cshep2d.c
 
-libsciinterpolation_la_FFLAGS=  -Iincludes/
-libsciinterpolation_la_CFLAGS=         -Iincludes/ \
-                               -Isrc/c/ \
+libsciinterpolation_la_FFLAGS=  -I$(srcdir)/includes/
+libsciinterpolation_la_CFLAGS=         -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                 -I$(top_srcdir)/modules/string/includes
index b12287f..ae7f767 100644 (file)
@@ -373,9 +373,9 @@ sci_gateway/c/sci_splin3d.c \
 sci_gateway/c/sci_bsplin3val.c \
 sci_gateway/c/sci_eval_cshep2d.c
 
-libsciinterpolation_la_FFLAGS = -Iincludes/
-libsciinterpolation_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
+libsciinterpolation_la_FFLAGS = -I$(srcdir)/includes/
+libsciinterpolation_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                 -I$(top_srcdir)/modules/string/includes
index 7ef22f0..a972373 100644 (file)
@@ -72,8 +72,8 @@ noinst_LTLIBRARIES = libdummy-io.la
 libdummy_io_la_SOURCES = sci_gateway/fortran/intmgetl.f
 libdummy_io_la_FFLAGS = $(FFLAGS:-O%=)
 
-libsciio_la_CFLAGS=    -Iincludes/ \
-                       -Isrc/c/ \
+libsciio_la_CFLAGS=    -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes
index abb5b5c..54bf88d 100644 (file)
@@ -428,8 +428,8 @@ sci_gateway/fortran/intfile.f
 noinst_LTLIBRARIES = libdummy-io.la
 libdummy_io_la_SOURCES = sci_gateway/fortran/intmgetl.f
 libdummy_io_la_FFLAGS = $(FFLAGS:-O%=)
-libsciio_la_CFLAGS = -Iincludes/ \
-                       -Isrc/c/ \
+libsciio_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes
index 4f99126..7527173 100644 (file)
@@ -31,7 +31,7 @@ libjavasci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
 libjavasci_la_SOURCES = $(JAVASCI_C_SOURCES)
 
-libjavasci_la_CFLAGS = -Iincludes/ \
+libjavasci_la_CFLAGS = -I$(srcdir)/includes/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
index 401a075..540ffdf 100644 (file)
@@ -360,7 +360,7 @@ modulename = javasci
 @JAVASCI_TRUE@pkglib_LTLIBRARIES = libjavasci.la
 @JAVASCI_TRUE@libjavasci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 @JAVASCI_TRUE@libjavasci_la_SOURCES = $(JAVASCI_C_SOURCES)
-@JAVASCI_TRUE@libjavasci_la_CFLAGS = -Iincludes/ \
+@JAVASCI_TRUE@libjavasci_la_CFLAGS = -I$(srcdir)/includes/ \
 @JAVASCI_TRUE@                 $(JAVA_JNI_INCLUDE) \
 @JAVASCI_TRUE@                 $(TCL_INC_PATH) \
 @JAVASCI_TRUE@                 $(TK_INC_PATH) \
index 627aa73..32196a1 100644 (file)
@@ -7,8 +7,8 @@
 libscijvm_la_CFLAGS=   $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-                       -Iincludes/ \
-                       -Isrc/c \
+                       -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c \
                        $(XML_FLAGS) \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index 4d3c4a0..0a07388 100644 (file)
@@ -357,8 +357,8 @@ top_srcdir = @top_srcdir@
 libscijvm_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-                       -Iincludes/ \
-                       -Isrc/c \
+                       -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c \
                        $(XML_FLAGS) \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index 952e2d4..61ba30f 100644 (file)
@@ -89,9 +89,9 @@ sci_gateway/c/sci_lsq.c
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/Ex-schur.f \
 sci_gateway/fortran/bschur.f
 
-libscilinear_algebra_la_CFLAGS=        -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscilinear_algebra_la_CFLAGS=        -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscilinear_algebra.la
 
index 74e2cb2..a1ac0cc 100644 (file)
@@ -448,9 +448,9 @@ sci_gateway/c/sci_lsq.c
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/Ex-schur.f \
 sci_gateway/fortran/bschur.f
 
-libscilinear_algebra_la_CFLAGS = -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscilinear_algebra_la_CFLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscilinear_algebra.la
 libscilinear_algebra_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 24a4012..4d0835d 100644 (file)
@@ -27,8 +27,8 @@ sci_gateway/c/sci_getlanguage.c
 #sci_gateway/c/sci_removetext.c
 
 libscilocalization_la_CFLAGS=          $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/c/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
index 237ce2d..a9e3ecd 100644 (file)
@@ -350,8 +350,8 @@ sci_gateway/c/sci_getlanguage.c
 #sci_gateway/c/sci_addtext.c \
 #sci_gateway/c/sci_removetext.c
 libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/c/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
index 1958d94..652e4ac 100644 (file)
@@ -43,9 +43,9 @@ MATIO_C_SOURCES = src/nomatio/nomatio.c
 
 endif
 
-libscimatio_la_CFLAGS = -Iincludes/ \
-                       -Isrc/c/ \
-                       -Isrc/matio/ \
+libscimatio_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(srcdir)/src/matio/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
                        $(MATIO_CFLAGS)
index 5b6414d..7b9bff7 100644 (file)
@@ -432,9 +432,9 @@ HELP_CHAPTERFILE = addchapter.sce
 @MATIO_TRUE@             src/c/GetSparseVariable.c
 
 @MATIO_TRUE@libscimatio_la_LDFLAGS = $(MATIO_LIBS)
-libscimatio_la_CFLAGS = -Iincludes/ \
-                       -Isrc/c/ \
-                       -Isrc/matio/ \
+libscimatio_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(srcdir)/src/matio/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
                        $(MATIO_CFLAGS)
index dc89171..bebb10c 100644 (file)
@@ -115,7 +115,7 @@ sci_gateway/fortran/sci_m6umtree1.f \
 sci_gateway/fortran/sci_m6umtree.f \
 sci_gateway/fortran/sci_m6visitor.f
 
-libscimetanet_la_CFLAGS=       -Iincludes/ \
+libscimetanet_la_CFLAGS=       -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
index 4952138..f7f5f90 100644 (file)
@@ -472,7 +472,7 @@ sci_gateway/fortran/sci_m6umtree1.f \
 sci_gateway/fortran/sci_m6umtree.f \
 sci_gateway/fortran/sci_m6visitor.f
 
-libscimetanet_la_CFLAGS = -Iincludes/ \
+libscimetanet_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
index 055f4fe..7ac89ee 100644 (file)
@@ -5,14 +5,14 @@
 
 MEXLIB_C_SOURCES = src/c/mexlib.c
 
-MEXLIB_FLAGS = -Iincludes/ -I$(top_builddir)/modules/output_stream/includes/
+MEXLIB_FLAGS = -I$(srcdir)/includes/ -I$(top_srcdir)/modules/output_stream/includes/
 
 MEXLIB_FLAGS += -I$(top_srcdir)/modules/string/includes
 
 
 MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
-$(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-$(top_builddir)/modules/data_structures/libscidata_structures.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/data_structures/libscidata_structures.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
     $(top_builddir)/modules/string/libscistring.la
 
index 6b1d8cf..4977989 100644 (file)
@@ -326,12 +326,12 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 MEXLIB_C_SOURCES = src/c/mexlib.c
-MEXLIB_FLAGS = -Iincludes/ \
-       -I$(top_builddir)/modules/output_stream/includes/ \
+MEXLIB_FLAGS = -I$(srcdir)/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
        -I$(top_srcdir)/modules/string/includes
 MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
-$(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-$(top_builddir)/modules/data_structures/libscidata_structures.la \
+       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+       $(top_builddir)/modules/data_structures/libscidata_structures.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
     $(top_builddir)/modules/string/libscistring.la
 
index e860a34..45cdf63 100644 (file)
@@ -117,10 +117,10 @@ sci_gateway/fortran/Ex-optim.f \
 sci_gateway/fortran/Ex-fsolve.f \
 sci_gateway/fortran/Ex-lsqrsolve.f
 
-libscioptimization_la_CFLAGS=          -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
-#-Isrc/c/
+libscioptimization_la_CFLAGS=          -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
+
 pkglib_LTLIBRARIES = libscioptimization.la
 
 libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index aca38ce..7d60887 100644 (file)
@@ -477,11 +477,10 @@ sci_gateway/fortran/Ex-optim.f \
 sci_gateway/fortran/Ex-fsolve.f \
 sci_gateway/fortran/Ex-lsqrsolve.f
 
-libscioptimization_la_CFLAGS = -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscioptimization_la_CFLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
-#-Isrc/c/
 pkglib_LTLIBRARIES = libscioptimization.la
 libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
index 3fb3447..8e38ed3 100644 (file)
@@ -34,9 +34,9 @@ GATEWAY_C_SOURCES =
 GATEWAY_FORTRAN_SOURCES =
 
 libscioutput_stream_la_CFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
--Iincludes/ \
+-I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes \
--Isrc/c/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
index a6b091d..4b34068 100644 (file)
@@ -349,9 +349,9 @@ OUTPUT_STREAM_FORTRAN_SOURCES =
 GATEWAY_C_SOURCES = 
 GATEWAY_FORTRAN_SOURCES = 
 libscioutput_stream_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
--Iincludes/ \
+-I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes \
--Isrc/c/ \
+-I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
index 05e98dd..3212137 100644 (file)
@@ -107,8 +107,8 @@ sci_gateway/fortran/sci_f_simpmd.f
 
 
 
-libscipolynomials_la_CFLAGS=   -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscipolynomials_la_CFLAGS=   -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscipolynomials.la
 
index 9d8a60a..738df0e 100644 (file)
@@ -466,8 +466,8 @@ sci_gateway/fortran/sci_f_pclean.f \
 sci_gateway/fortran/sci_f_sfact.f \
 sci_gateway/fortran/sci_f_simpmd.f
 
-libscipolynomials_la_CFLAGS = -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscipolynomials_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscipolynomials.la
 libscipolynomials_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index ffbb42f..0f8c183 100644 (file)
@@ -50,7 +50,7 @@ sci_gateway/c/sci_pvm_config.c \
 sci_gateway/c/sci_pvm_recv_var.c \
 sci_gateway/c/sci_pvm_exit.c
 
-libscipvm_la_CFLAGS=  -Iincludes/ -I$(top_srcdir)/libs/MALLOC/includes/ -Isrc/c/  -I$(top_srcdir)/modules/output_stream/includes/
+libscipvm_la_CFLAGS=  -I$(srcdir)/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(srcdir)/src/c/  -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscipvm.la
 
index e2c9c53..36adaf9 100644 (file)
@@ -452,7 +452,7 @@ top_srcdir = @top_srcdir@
 @PVM_TRUE@sci_gateway/c/sci_pvm_exit.c
 
 @PVM_FALSE@libscipvm_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes/
-@PVM_TRUE@libscipvm_la_CFLAGS = -Iincludes/ -I$(top_srcdir)/libs/MALLOC/includes/ -Isrc/c/  -I$(top_srcdir)/modules/output_stream/includes/
+@PVM_TRUE@libscipvm_la_CFLAGS = -I$(srcdir)/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(srcdir)/src/c/  -I$(top_srcdir)/modules/output_stream/includes/
 @PVM_FALSE@pkglib_LTLIBRARIES = libscipvm.la
 @PVM_TRUE@pkglib_LTLIBRARIES = libscipvm.la
 @PVM_FALSE@libscipvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index bd2b214..cac76f0 100644 (file)
@@ -44,8 +44,8 @@ src/fortran/gennor.f
 GATEWAY_C_SOURCES = sci_gateway/c/gw_randlib.c \
 sci_gateway/c/sci_grand.c
 
-libscirandlib_la_CFLAGS=       -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscirandlib_la_CFLAGS=       -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscirandlib.la
 
index 10dc2a7..323908d 100644 (file)
@@ -379,8 +379,8 @@ src/fortran/gennor.f
 GATEWAY_C_SOURCES = sci_gateway/c/gw_randlib.c \
 sci_gateway/c/sci_grand.c
 
-libscirandlib_la_CFLAGS = -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscirandlib_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscirandlib.la
 libscirandlib_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 30902fc..1189925 100644 (file)
@@ -267,9 +267,9 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_renderer.c
 
 # Includes need for the compilation
 libscirenderer_la_CPPFLAGS =   $(JAVA_JNI_INCLUDE) \
-                               -Iincludes/ \
-                               -Isrc/cpp/ \
-                               -Isrc/jni/ \
+                               -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/cpp/ \
+                               -I$(srcdir)/src/jni/ \
                                -I$(top_srcdir)/modules/jvm/includes \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
index 4beb3a7..a8a251c 100644 (file)
@@ -1085,9 +1085,9 @@ top_srcdir = @top_srcdir@
 
 # Includes need for the compilation
 @GUI_TRUE@libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-@GUI_TRUE@                             -Iincludes/ \
-@GUI_TRUE@                             -Isrc/cpp/ \
-@GUI_TRUE@                             -Isrc/jni/ \
+@GUI_TRUE@                             -I$(srcdir)/includes/ \
+@GUI_TRUE@                             -I$(srcdir)/src/cpp/ \
+@GUI_TRUE@                             -I$(srcdir)/src/jni/ \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/jvm/includes \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/graphics/includes/ \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
index dd587fe..dffd9bf 100644 (file)
@@ -94,8 +94,8 @@ sci_gateway/fortran/sci_vec2var.f
 
 #CLEANFILES=includes/blocks.h build/Cblocknames build/Fblocknames
 
-libsciscicos_la_CFLAGS= -Iincludes/ \
-                       -Isrc/scicos_sundials/ \
+libsciscicos_la_CFLAGS= -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/scicos_sundials/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/libs/doublylinkedlist/includes \
@@ -348,28 +348,28 @@ modelicac_SOURCES = $(MLS)
 
 OCAMLLIBS=nums.cma
 
-MLS = src/modelica_compiler/parseTree.ml src/modelica_compiler/linenum.ml src/modelica_compiler/parser.ml src/modelica_compiler/lexer.ml\
-       src/modelica_compiler/precompilation.ml src/modelica_compiler/compilation.ml src/modelica_compiler/instantiation.ml\
-       src/modelica_compiler/graphNodeSet.ml src/modelica_compiler/symbolicExpression.ml\
-       src/modelica_compiler/squareSparseMatrix.ml src/modelica_compiler/bipartiteGraph.ml src/modelica_compiler/hungarianMethod.ml\
-       src/modelica_compiler/causalityGraph.ml\
-       src/modelica_compiler/optimization.ml  src/modelica_compiler/xMLCodeGeneration.ml src/modelica_compiler/optimizingCompiler.ml\
-       src/modelica_compiler/scicosCodeGeneration.ml src/modelica_compiler/scicosOptimizingCompiler.ml
-
-MLIS = src/modelica_compiler/parseTree.mli \
-       src/modelica_compiler/precompilation.mli src/modelica_compiler/compilation.mli src/modelica_compiler/instantiation.mli\
-       src/modelica_compiler/graphNodeSet.mli src/modelica_compiler/symbolicExpression.mli \
-       src/modelica_compiler/squareSparseMatrix.mli src/modelica_compiler/bipartiteGraph.mli src/modelica_compiler/hungarianMethod.mli \
-       src/modelica_compiler/causalityGraph.mli \
-       src/modelica_compiler/optimization.mli \
-       src/modelica_compiler/xMLCodeGeneration.mli \
-       src/modelica_compiler/optimizingCompiler.mli \
-       src/modelica_compiler/scicosCodeGeneration.mli
-
-
-PARSER_SRC = src/modelica_compiler/parser.mly
-LEXER_SRC = src/modelica_compiler/lexer.mll
-BASE_PATH = src/modelica_compiler
+MLS = $(srcdir)/src/modelica_compiler/parseTree.ml $(srcdir)/src/modelica_compiler/linenum.ml $(srcdir)/src/modelica_compiler/parser.ml $(srcdir)/src/modelica_compiler/lexer.ml\
+       $(srcdir)/src/modelica_compiler/precompilation.ml $(srcdir)/src/modelica_compiler/compilation.ml $(srcdir)/src/modelica_compiler/instantiation.ml\
+       $(srcdir)/src/modelica_compiler/graphNodeSet.ml $(srcdir)/src/modelica_compiler/symbolicExpression.ml\
+       $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml $(srcdir)/src/modelica_compiler/bipartiteGraph.ml $(srcdir)/src/modelica_compiler/hungarianMethod.ml\
+       $(srcdir)/src/modelica_compiler/causalityGraph.ml\
+       $(srcdir)/src/modelica_compiler/optimization.ml  $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml $(srcdir)/src/modelica_compiler/optimizingCompiler.ml\
+       $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
+
+MLIS = $(srcdir)/src/modelica_compiler/parseTree.mli \
+       $(srcdir)/src/modelica_compiler/precompilation.mli $(srcdir)/src/modelica_compiler/compilation.mli $(srcdir)/src/modelica_compiler/instantiation.mli\
+       $(srcdir)/src/modelica_compiler/graphNodeSet.mli $(srcdir)/src/modelica_compiler/symbolicExpression.mli \
+       $(srcdir)/src/modelica_compiler/squareSparseMatrix.mli $(srcdir)/src/modelica_compiler/bipartiteGraph.mli $(srcdir)/src/modelica_compiler/hungarianMethod.mli \
+       $(srcdir)/src/modelica_compiler/causalityGraph.mli \
+       $(srcdir)/src/modelica_compiler/optimization.mli \
+       $(srcdir)/src/modelica_compiler/xMLCodeGeneration.mli \
+       $(srcdir)/src/modelica_compiler/optimizingCompiler.mli \
+       $(srcdir)/src/modelica_compiler/scicosCodeGeneration.mli
+
+
+PARSER_SRC = $(srcdir)/src/modelica_compiler/parser.mly
+LEXER_SRC = $(srcdir)/src/modelica_compiler/lexer.mll
+BASE_PATH = $(srcdir)/src/modelica_compiler
 INCLUDE = -I $(BASE_PATH)
 
 SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
index df70220..fc41453 100644 (file)
@@ -240,23 +240,25 @@ libscisundials_la_OBJECTS = $(am_libscisundials_la_OBJECTS)
 @OCAML_TRUE@@SCICOS_TRUE@am__EXEEXT_1 = modelicac$(EXEEXT)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__modelicac_SOURCES_DIST = src/modelica_compiler/parseTree.ml \
-       src/modelica_compiler/linenum.ml \
-       src/modelica_compiler/parser.ml src/modelica_compiler/lexer.ml \
-       src/modelica_compiler/precompilation.ml \
-       src/modelica_compiler/compilation.ml \
-       src/modelica_compiler/instantiation.ml \
-       src/modelica_compiler/graphNodeSet.ml \
-       src/modelica_compiler/symbolicExpression.ml \
-       src/modelica_compiler/squareSparseMatrix.ml \
-       src/modelica_compiler/bipartiteGraph.ml \
-       src/modelica_compiler/hungarianMethod.ml \
-       src/modelica_compiler/causalityGraph.ml \
-       src/modelica_compiler/optimization.ml \
-       src/modelica_compiler/xMLCodeGeneration.ml \
-       src/modelica_compiler/optimizingCompiler.ml \
-       src/modelica_compiler/scicosCodeGeneration.ml \
-       src/modelica_compiler/scicosOptimizingCompiler.ml
+am__modelicac_SOURCES_DIST =  \
+       $(srcdir)/src/modelica_compiler/parseTree.ml \
+       $(srcdir)/src/modelica_compiler/linenum.ml \
+       $(srcdir)/src/modelica_compiler/parser.ml \
+       $(srcdir)/src/modelica_compiler/lexer.ml \
+       $(srcdir)/src/modelica_compiler/precompilation.ml \
+       $(srcdir)/src/modelica_compiler/compilation.ml \
+       $(srcdir)/src/modelica_compiler/instantiation.ml \
+       $(srcdir)/src/modelica_compiler/graphNodeSet.ml \
+       $(srcdir)/src/modelica_compiler/symbolicExpression.ml \
+       $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml \
+       $(srcdir)/src/modelica_compiler/bipartiteGraph.ml \
+       $(srcdir)/src/modelica_compiler/hungarianMethod.ml \
+       $(srcdir)/src/modelica_compiler/causalityGraph.ml \
+       $(srcdir)/src/modelica_compiler/optimization.ml \
+       $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml \
+       $(srcdir)/src/modelica_compiler/optimizingCompiler.ml \
+       $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml \
+       $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
 am__objects_7 =
 @OCAML_TRUE@@SCICOS_TRUE@am_modelicac_OBJECTS = $(am__objects_7)
 modelicac_OBJECTS = $(am_modelicac_OBJECTS)
@@ -636,8 +638,8 @@ HELP_CHAPTERFILE = addchapter.sce
 
 
 #CLEANFILES=includes/blocks.h build/Cblocknames build/Fblocknames
-@SCICOS_TRUE@libsciscicos_la_CFLAGS = -Iincludes/ \
-@SCICOS_TRUE@                  -Isrc/scicos_sundials/ \
+@SCICOS_TRUE@libsciscicos_la_CFLAGS = -I$(srcdir)/includes/ \
+@SCICOS_TRUE@                  -I$(srcdir)/src/scicos_sundials/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/libs/MALLOC/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/output_stream/includes \
 @SCICOS_TRUE@                  -I$(top_srcdir)/libs/doublylinkedlist/includes \
@@ -896,27 +898,27 @@ HELP_CHAPTERFILE = addchapter.sce
 @OCAML_TRUE@@SCICOS_TRUE@TARGET = modelicac
 @OCAML_TRUE@@SCICOS_TRUE@modelicac_SOURCES = $(MLS)
 @OCAML_TRUE@@SCICOS_TRUE@OCAMLLIBS = nums.cma
-@OCAML_TRUE@@SCICOS_TRUE@MLS = src/modelica_compiler/parseTree.ml src/modelica_compiler/linenum.ml src/modelica_compiler/parser.ml src/modelica_compiler/lexer.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/precompilation.ml src/modelica_compiler/compilation.ml src/modelica_compiler/instantiation.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/graphNodeSet.ml src/modelica_compiler/symbolicExpression.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/squareSparseMatrix.ml src/modelica_compiler/bipartiteGraph.ml src/modelica_compiler/hungarianMethod.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/causalityGraph.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/optimization.ml  src/modelica_compiler/xMLCodeGeneration.ml src/modelica_compiler/optimizingCompiler.ml\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/scicosCodeGeneration.ml src/modelica_compiler/scicosOptimizingCompiler.ml
-
-@OCAML_TRUE@@SCICOS_TRUE@MLIS = src/modelica_compiler/parseTree.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/precompilation.mli src/modelica_compiler/compilation.mli src/modelica_compiler/instantiation.mli\
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/graphNodeSet.mli src/modelica_compiler/symbolicExpression.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/squareSparseMatrix.mli src/modelica_compiler/bipartiteGraph.mli src/modelica_compiler/hungarianMethod.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/causalityGraph.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/optimization.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/xMLCodeGeneration.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/optimizingCompiler.mli \
-@OCAML_TRUE@@SCICOS_TRUE@      src/modelica_compiler/scicosCodeGeneration.mli
-
-@OCAML_TRUE@@SCICOS_TRUE@PARSER_SRC = src/modelica_compiler/parser.mly
-@OCAML_TRUE@@SCICOS_TRUE@LEXER_SRC = src/modelica_compiler/lexer.mll
-@OCAML_TRUE@@SCICOS_TRUE@BASE_PATH = src/modelica_compiler
+@OCAML_TRUE@@SCICOS_TRUE@MLS = $(srcdir)/src/modelica_compiler/parseTree.ml $(srcdir)/src/modelica_compiler/linenum.ml $(srcdir)/src/modelica_compiler/parser.ml $(srcdir)/src/modelica_compiler/lexer.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/precompilation.ml $(srcdir)/src/modelica_compiler/compilation.ml $(srcdir)/src/modelica_compiler/instantiation.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/graphNodeSet.ml $(srcdir)/src/modelica_compiler/symbolicExpression.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml $(srcdir)/src/modelica_compiler/bipartiteGraph.ml $(srcdir)/src/modelica_compiler/hungarianMethod.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/causalityGraph.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/optimization.ml  $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml $(srcdir)/src/modelica_compiler/optimizingCompiler.ml\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
+
+@OCAML_TRUE@@SCICOS_TRUE@MLIS = $(srcdir)/src/modelica_compiler/parseTree.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/precompilation.mli $(srcdir)/src/modelica_compiler/compilation.mli $(srcdir)/src/modelica_compiler/instantiation.mli\
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/graphNodeSet.mli $(srcdir)/src/modelica_compiler/symbolicExpression.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/squareSparseMatrix.mli $(srcdir)/src/modelica_compiler/bipartiteGraph.mli $(srcdir)/src/modelica_compiler/hungarianMethod.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/causalityGraph.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/optimization.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/xMLCodeGeneration.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/optimizingCompiler.mli \
+@OCAML_TRUE@@SCICOS_TRUE@      $(srcdir)/src/modelica_compiler/scicosCodeGeneration.mli
+
+@OCAML_TRUE@@SCICOS_TRUE@PARSER_SRC = $(srcdir)/src/modelica_compiler/parser.mly
+@OCAML_TRUE@@SCICOS_TRUE@LEXER_SRC = $(srcdir)/src/modelica_compiler/lexer.mll
+@OCAML_TRUE@@SCICOS_TRUE@BASE_PATH = $(srcdir)/src/modelica_compiler
 @OCAML_TRUE@@SCICOS_TRUE@INCLUDE = -I $(BASE_PATH)
 @OCAML_TRUE@@SCICOS_TRUE@CLEANFILES = $(BASE_PATH)/*.cmi $(BASE_PATH)/*.o $(BASE_PATH)/*.cmo $(BASE_PATH)/*.cm[aiox] $(TARGET) $(BASE_PATH)/parser.mli $(BASE_PATH)/lexer.mli $(BASE_PATH)/parser.ml $(BASE_PATH)/lexer.ml
 @SCICOS_FALSE@NO_SCICOS_C_SOURCES = src/c/noscicos/noscicos.c
index 9c7c57f..ce488de 100644 (file)
@@ -397,14 +397,14 @@ src/fortran/zcross.f
 
 
 
-libsciscicos_blocks_la_CFLAGS= -Iincludes/ \
+libsciscicos_blocks_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/scicos/includes \
-                        -I$(top_srcdir)/modules/elementary_functions/includes
+            -I$(top_srcdir)/modules/elementary_functions/includes
 
 
 libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
index 13a6ce3..4d96f1c 100644 (file)
@@ -1225,14 +1225,14 @@ HELP_CHAPTERFILE = addchapter.sce
 #### scicos_blocks : GATEWAY_C_SOURCES ####
 
 #### scicos_blocks : GATEWAY_FORTRAN_SOURCES ####
-@SCICOS_TRUE@libsciscicos_blocks_la_CFLAGS = -Iincludes/ \
+@SCICOS_TRUE@libsciscicos_blocks_la_CFLAGS = -I$(srcdir)/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/libs/MALLOC/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/graphics/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/renderer/includes/ \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/output_stream/includes \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/scicos/includes \
-@SCICOS_TRUE@                        -I$(top_srcdir)/modules/elementary_functions/includes
+@SCICOS_TRUE@            -I$(top_srcdir)/modules/elementary_functions/includes
 
 @SCICOS_FALSE@libsciscicos_blocks_la_SOURCES = 
 @SCICOS_TRUE@libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
index 4279789..dcc8968 100644 (file)
@@ -28,8 +28,8 @@ sci_gateway/c/sci_prompt.c \
 sci_gateway/c/sci_iswaitingforinput.c
 
 # Includes need for the compilation
-libscishell_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ \
--Isrc/c/others/ -I$(top_srcdir)/libs/MALLOC/includes/
+libscishell_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ \
+-I$(srcdir)/src/c/others/ -I$(top_srcdir)/libs/MALLOC/includes/
 
 # Includes need for the compilation
 libscishell_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
index 23aca94..f6be791 100644 (file)
@@ -354,8 +354,8 @@ sci_gateway/c/sci_iswaitingforinput.c
 
 
 # Includes need for the compilation
-libscishell_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/cpp/ -Isrc/c/ \
--Isrc/c/others/ -I$(top_srcdir)/libs/MALLOC/includes/
+libscishell_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ \
+-I$(srcdir)/src/c/others/ -I$(top_srcdir)/libs/MALLOC/includes/
 
 
 # Includes need for the compilation
index affed3b..d7a36f8 100644 (file)
@@ -92,9 +92,9 @@ sci_gateway/fortran/bgetx.f \
 sci_gateway/fortran/bgety.f \
 sci_gateway/fortran/Ex-corr.f
 
-libscisignal_processing_la_CFLAGS=     -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscisignal_processing_la_CFLAGS=     -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscisignal_processing.la
 
index 426b763..8107130 100644 (file)
@@ -446,9 +446,9 @@ sci_gateway/fortran/bgetx.f \
 sci_gateway/fortran/bgety.f \
 sci_gateway/fortran/Ex-corr.f
 
-libscisignal_processing_la_CFLAGS = -Iincludes/ \
--I$(top_builddir)/modules/output_stream/includes \
--I$(top_builddir)/modules/dynamic_link/includes
+libscisignal_processing_la_CFLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscisignal_processing.la
 libscisignal_processing_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 2bd30cf..ef725aa 100644 (file)
@@ -13,8 +13,8 @@ sci_gateway/c/gw_sound.c \
 sci_gateway/c/sci_beep.c \
 sci_gateway/c/sci_PlaySound.c
 
-libscisound_la_CFLAGS=  -Iincludes/ \
-                       -Isrc/c/ \
+libscisound_la_CFLAGS=  -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes
 
index 8b4cd9e..887cbb9 100644 (file)
@@ -332,8 +332,8 @@ sci_gateway/c/gw_sound.c \
 sci_gateway/c/sci_beep.c \
 sci_gateway/c/sci_PlaySound.c
 
-libscisound_la_CFLAGS = -Iincludes/ \
-                       -Isrc/c/ \
+libscisound_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes
 
index eef694b..e690953 100644 (file)
@@ -161,8 +161,8 @@ sci_gateway/fortran/sci_lusolve.f \
 sci_gateway/fortran/sci_fadj2sp.f \
 sci_gateway/fortran/sci_sfinit.f
 
-libscisparse_la_CFLAGS=        -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscisparse_la_CFLAGS=        -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisparse.la
 
index 13732f0..4cf4f8f 100644 (file)
@@ -527,8 +527,8 @@ sci_gateway/fortran/sci_lusolve.f \
 sci_gateway/fortran/sci_fadj2sp.f \
 sci_gateway/fortran/sci_sfinit.f
 
-libscisparse_la_CFLAGS = -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscisparse_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisparse.la
index dd12f26..baee6e7 100644 (file)
@@ -36,9 +36,9 @@ libscispecial_functions_la_includedir=$(pkgincludedir)/special_functions
 libscispecial_functions_la_include_HEADERS = includes/gw_special_functions1.h \
 includes/gw_special_functions2.h
 
-libscispecial_functions_la_CFLAGS=     -Iincludes/ \
--I$(top_builddir)/modules/elementary_functions/includes/ \
--I$(top_builddir)/modules/output_stream/includes/
+libscispecial_functions_la_CFLAGS=     -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/elementary_functions/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscispecial_functions.la
 
index 73e4432..ab66507 100644 (file)
@@ -380,9 +380,9 @@ libscispecial_functions_la_includedir = $(pkgincludedir)/special_functions
 libscispecial_functions_la_include_HEADERS = includes/gw_special_functions1.h \
 includes/gw_special_functions2.h
 
-libscispecial_functions_la_CFLAGS = -Iincludes/ \
--I$(top_builddir)/modules/elementary_functions/includes/ \
--I$(top_builddir)/modules/output_stream/includes/
+libscispecial_functions_la_CFLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/elementary_functions/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscispecial_functions.la
 libscispecial_functions_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 05c87c3..f6d96a9 100644 (file)
@@ -17,8 +17,8 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_spreadsheet.c \
 sci_gateway/c/sci_xls_read.c \
 sci_gateway/c/sci_xls_open.c
 
-libscispreadsheet_la_CFLAGS=   -Iincludes/ \
-                               -Isrc/c/ \
+libscispreadsheet_la_CFLAGS=   -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes
 
index b8514fc..83ebf09 100644 (file)
@@ -346,8 +346,8 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_spreadsheet.c \
 sci_gateway/c/sci_xls_read.c \
 sci_gateway/c/sci_xls_open.c
 
-libscispreadsheet_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
+libscispreadsheet_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes
 
index b68bcdc..364f636 100644 (file)
@@ -82,9 +82,9 @@ sci_gateway/c/sci_cdfbet.c \
 sci_gateway/c/sci_cdfnbn.c \
 sci_gateway/c/sci_cdfnor.c
 
-libscistatistics_la_CFLAGS=    -Iincludes/ \
-                               -Isrc/c/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscistatistics_la_CFLAGS=    -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscistatistics.la
 
index 922339e..8f7e58c 100644 (file)
@@ -429,9 +429,9 @@ sci_gateway/c/sci_cdfbet.c \
 sci_gateway/c/sci_cdfnbn.c \
 sci_gateway/c/sci_cdfnor.c
 
-libscistatistics_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscistatistics_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscistatistics.la
index 826364f..d30f0f9 100644 (file)
@@ -64,8 +64,8 @@ GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_string.f \
 sci_gateway/fortran/strops.f
 
 libscistring_la_CFLAGS= $(PCRE_CFLAGS) \
-       -Isrc/c \
-       -Iincludes/ \
+       -I$(srcdir)/src/c \
+       -I$(srcdir)/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes
 
index ac3a66f..ffc5e45 100644 (file)
@@ -417,8 +417,8 @@ GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_string.f \
 sci_gateway/fortran/strops.f
 
 libscistring_la_CFLAGS = $(PCRE_CFLAGS) \
-       -Isrc/c \
-       -Iincludes/ \
+       -I$(srcdir)/src/c \
+       -I$(srcdir)/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes
 
index ed5af5c..bb3b524 100644 (file)
@@ -19,8 +19,8 @@ sci_gateway/fortran/sci_mulf.f \
 sci_gateway/fortran/sci_ldivf.f \
 sci_gateway/fortran/sci_rdivf.f
 
-libscisymbolic_la_CFLAGS=      -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscisymbolic_la_CFLAGS=      -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisymbolic.la
 
index ad9c395..ffa3252 100644 (file)
@@ -343,8 +343,8 @@ sci_gateway/fortran/sci_mulf.f \
 sci_gateway/fortran/sci_ldivf.f \
 sci_gateway/fortran/sci_rdivf.f
 
-libscisymbolic_la_CFLAGS = -Iincludes/ \
-                               -I$(top_builddir)/modules/output_stream/includes
+libscisymbolic_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisymbolic.la
index 687cf9c..2836119 100644 (file)
@@ -40,9 +40,9 @@ pkglib_LTLIBRARIES = libscitclsci.la
 
 libscitclsci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(TCLTK_LIBS)
 
-libscitclsci_la_CFLAGS= -Iincludes/ \
-                       -Isrc/c \
-                       -Isci_gateway/c/ \
+libscitclsci_la_CFLAGS= -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c \
+                       -I$(srcdir)/sci_gateway/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
index 9dae944..f55bb8f 100644 (file)
@@ -411,9 +411,9 @@ top_srcdir = @top_srcdir@
 
 @TCLTK_TRUE@pkglib_LTLIBRARIES = libscitclsci.la
 @TCLTK_TRUE@libscitclsci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(TCLTK_LIBS)
-@TCLTK_TRUE@libscitclsci_la_CFLAGS = -Iincludes/ \
-@TCLTK_TRUE@                   -Isrc/c \
-@TCLTK_TRUE@                   -Isci_gateway/c/ \
+@TCLTK_TRUE@libscitclsci_la_CFLAGS = -I$(srcdir)/includes/ \
+@TCLTK_TRUE@                   -I$(srcdir)/src/c \
+@TCLTK_TRUE@                   -I$(srcdir)/sci_gateway/c/ \
 @TCLTK_TRUE@                   -I$(top_srcdir)/libs/MALLOC/includes/ \
 @TCLTK_TRUE@                   $(TCL_INC_PATH) \
 @TCLTK_TRUE@                   $(TK_INC_PATH) \
index 96921fc..c7f31dd 100644 (file)
@@ -17,9 +17,9 @@ sci_gateway/c/sci_sleep.c \
 sci_gateway/c/sci_getdate.c \
 sci_gateway/c/gw_time.c
 
-libscitime_la_CFLAGS=          -Iincludes/ \
+libscitime_la_CFLAGS=          -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
-                       -Isrc/c/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscitime.la
index b548932..e1c0e42 100644 (file)
@@ -335,9 +335,9 @@ sci_gateway/c/sci_sleep.c \
 sci_gateway/c/sci_getdate.c \
 sci_gateway/c/gw_time.c
 
-libscitime_la_CFLAGS = -Iincludes/ \
+libscitime_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
-                       -Isrc/c/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscitime.la
index f19cc70..9fbc7b2 100644 (file)
@@ -70,8 +70,8 @@ if USE_EMBEDDED_BLAS
 libsciumfpack_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 
 endif
 
-libsciumfpack_la_CFLAGS= -Iincludes/ \
-                       -Isrc/c/ \
+libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/mexlib/includes
index 3364222..7543708 100644 (file)
@@ -415,8 +415,8 @@ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
 @UMFPACK_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
 @UMFPACK_TRUE@ $(am__append_2) $(am__append_3)
 @UMFPACK_FALSE@libsciumfpack_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
-@UMFPACK_TRUE@libsciumfpack_la_CFLAGS = -Iincludes/ \
-@UMFPACK_TRUE@                 -Isrc/c/ \
+@UMFPACK_TRUE@libsciumfpack_la_CFLAGS = -I$(srcdir)/includes/ \
+@UMFPACK_TRUE@                 -I$(srcdir)/src/c/ \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/mexlib/includes
index fcfd698..4e62c64 100644 (file)
@@ -7,8 +7,8 @@
 WINDOWS_TOOLS_C_SOURCES = src/nowindows_tools/nowindows_tools.c
 
 # Includes need for the compilation
-libsciwindows_tools_la_CFLAGS=  -Iincludes/ \
-                               -Isrc/c/ \
+libsciwindows_tools_la_CFLAGS=  -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes
 
index a9caa64..afb2a43 100644 (file)
@@ -321,8 +321,8 @@ top_srcdir = @top_srcdir@
 WINDOWS_TOOLS_C_SOURCES = src/nowindows_tools/nowindows_tools.c
 
 # Includes need for the compilation
-libsciwindows_tools_la_CFLAGS = -Iincludes/ \
-                               -Isrc/c/ \
+libsciwindows_tools_la_CFLAGS = -I$(srcdir)/includes/ \
+                               -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes