Fix include paths 64/15564/2
Vincent COUVERT [Wed, 19 Nov 2014 16:05:06 +0000 (17:05 +0100)]
Change-Id: Ia2713fd83ea9a64edff2a4a4eed092803d5e89ad

17 files changed:
scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/functions_manager/Makefile.am
scilab/modules/functions_manager/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in

index 54eb3bb..5bdcd77 100644 (file)
@@ -106,15 +106,15 @@ endif
 
 
 libsciast_la_CPPFLAGS = \
-       -Iincludes/ast \
-       -Iincludes/exps \
-       -Iincludes/operations \
-       -Iincludes/parse \
-       -Iincludes/symbol \
-       -Iincludes/system_env \
-       -Iincludes/types \
-       -Iincludes/analysis \
-       -Isrc/cpp \
+       -I$(srcdir)/includes/ast \
+       -I$(srcdir)/includes/exps \
+       -I$(srcdir)/includes/operations \
+       -I$(srcdir)/includes/parse \
+       -I$(srcdir)/includes/symbol \
+       -I$(srcdir)/includes/system_env \
+       -I$(srcdir)/includes/types \
+       -I$(srcdir)/includes/analysis \
+       -I$(srcdir)/src/cpp \
     -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/functions_manager/includes \
        -I$(top_srcdir)/modules/console/includes \
index ef3c447..0689d73 100644 (file)
@@ -747,15 +747,15 @@ libsciast_la_SOURCES = src/cpp/ast/runvisitor.cpp \
        src/cpp/system_env/configvariable_interface.cpp \
        $(am__append_1)
 libsciast_la_CPPFLAGS = \
-       -Iincludes/ast \
-       -Iincludes/exps \
-       -Iincludes/operations \
-       -Iincludes/parse \
-       -Iincludes/symbol \
-       -Iincludes/system_env \
-       -Iincludes/types \
-       -Iincludes/analysis \
-       -Isrc/cpp \
+       -I$(srcdir)/includes/ast \
+       -I$(srcdir)/includes/exps \
+       -I$(srcdir)/includes/operations \
+       -I$(srcdir)/includes/parse \
+       -I$(srcdir)/includes/symbol \
+       -I$(srcdir)/includes/system_env \
+       -I$(srcdir)/includes/types \
+       -I$(srcdir)/includes/analysis \
+       -I$(srcdir)/src/cpp \
     -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/functions_manager/includes \
        -I$(top_srcdir)/modules/console/includes \
index cca51d5..b63c705 100644 (file)
@@ -186,7 +186,6 @@ libscicore_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes/system_env/ \
     -I$(top_srcdir)/modules/ast/includes/types/ \
     -I$(top_srcdir)/modules/ast/includes/analysis/ \
-    -I$(top_srcdir)/modules/intersci/includes/ \
     -I$(top_srcdir)/modules/call_scilab/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/action_binding/includes/ \
index de432e2..2716196 100644 (file)
@@ -883,7 +883,6 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/ast/includes/system_env/ \
        -I$(top_srcdir)/modules/ast/includes/types/ \
        -I$(top_srcdir)/modules/ast/includes/analysis/ \
-       -I$(top_srcdir)/modules/intersci/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
index 8a1d9d2..ec5799f 100644 (file)
@@ -131,7 +131,6 @@ libscifileio_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/functions_manager/includes \
        -I$(top_srcdir)/modules/string/includes \
        -I$(top_srcdir)/modules/io/includes \
-       -I$(top_srcdir)/modules/shell/includes \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/console/includes \
        -I$(top_srcdir)/modules/localization/includes \
index dae367e..61d8bd7 100644 (file)
@@ -780,7 +780,6 @@ libscifileio_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/functions_manager/includes \
        -I$(top_srcdir)/modules/string/includes \
        -I$(top_srcdir)/modules/io/includes \
-       -I$(top_srcdir)/modules/shell/includes \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/console/includes \
        -I$(top_srcdir)/modules/localization/includes \
index 5c29603..065c375 100644 (file)
@@ -21,7 +21,7 @@ libscifunctions_manager_la_SOURCES = \
     $(FUNCTION_MANAGER_CPP_SOURCES)
 
 libscifunctions_manager_la_CPPFLAGS = \
-    -Iincludes/ \
+    -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/ast/includes/ast/ \
     -I$(top_srcdir)/modules/ast/includes/exps/ \
     -I$(top_srcdir)/modules/ast/includes/operations/ \
@@ -31,18 +31,18 @@ libscifunctions_manager_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes/types/ \
     -I$(top_srcdir)/modules/ast/includes/analysis/ \
     -I$(top_srcdir)/modules/dynamic_link/includes \
-       -I$(top_builddir)/modules/api_scilab/includes/ \
-       -I$(top_builddir)/modules/console/includes/ \
-    -I$(top_builddir)/modules/core/includes/ \
-       -I$(top_builddir)/modules/elementary_functions/includes/ \
-       -I$(top_builddir)/modules/fileio/includes/ \
-       -I$(top_builddir)/modules/jvm/includes/ \
-       -I$(top_builddir)/modules/localization/includes/ \
-       -I$(top_builddir)/modules/output_stream/includes/ \
-    -I$(top_builddir)/modules/signal_processing/includes/ \
-       -I$(top_builddir)/modules/string/includes/ \
-       -I$(top_builddir)/modules/threads/includes/ \
-       $(AM_CPPGFLAGS) \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/console/includes/ \
+    -I$(top_srcdir)/modules/core/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+    -I$(top_srcdir)/modules/signal_processing/includes/ \
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       $(AM_CPPFLAGS) \
     $(EIGEN_CPPFLAGS) \
        $(XML_FLAGS)
 
index d96a130..2f910b3 100644 (file)
@@ -562,7 +562,7 @@ libscifunctions_manager_la_SOURCES = \
     $(FUNCTION_MANAGER_CPP_SOURCES)
 
 libscifunctions_manager_la_CPPFLAGS = \
-    -Iincludes/ \
+    -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/ast/includes/ast/ \
     -I$(top_srcdir)/modules/ast/includes/exps/ \
     -I$(top_srcdir)/modules/ast/includes/operations/ \
@@ -572,18 +572,18 @@ libscifunctions_manager_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes/types/ \
     -I$(top_srcdir)/modules/ast/includes/analysis/ \
     -I$(top_srcdir)/modules/dynamic_link/includes \
-       -I$(top_builddir)/modules/api_scilab/includes/ \
-       -I$(top_builddir)/modules/console/includes/ \
-    -I$(top_builddir)/modules/core/includes/ \
-       -I$(top_builddir)/modules/elementary_functions/includes/ \
-       -I$(top_builddir)/modules/fileio/includes/ \
-       -I$(top_builddir)/modules/jvm/includes/ \
-       -I$(top_builddir)/modules/localization/includes/ \
-       -I$(top_builddir)/modules/output_stream/includes/ \
-    -I$(top_builddir)/modules/signal_processing/includes/ \
-       -I$(top_builddir)/modules/string/includes/ \
-       -I$(top_builddir)/modules/threads/includes/ \
-       $(AM_CPPGFLAGS) \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/console/includes/ \
+    -I$(top_srcdir)/modules/core/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+    -I$(top_srcdir)/modules/signal_processing/includes/ \
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       $(AM_CPPFLAGS) \
     $(EIGEN_CPPFLAGS) \
        $(XML_FLAGS)
 
index d4e29c0..be6e762 100644 (file)
@@ -31,7 +31,6 @@ GATEWAY_CPP_SOURCES = \
 
 libsciinterpolation_la_CPPFLAGS= \
     -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
     -I$(top_srcdir)/modules/ast/includes/ast/ \
     -I$(top_srcdir)/modules/ast/includes/exps/ \
index c417563..e2deb63 100644 (file)
@@ -602,7 +602,6 @@ GATEWAY_CPP_SOURCES = \
 
 libsciinterpolation_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
     -I$(top_srcdir)/modules/ast/includes/ast/ \
     -I$(top_srcdir)/modules/ast/includes/exps/ \
index 9a261aa..f7f2404 100644 (file)
@@ -998,9 +998,9 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@clean-local:
-@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-html-local:
+@JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
index 41e41e8..edfffcd 100644 (file)
@@ -144,7 +144,6 @@ libsciscicos_algo_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
-                       -I$(top_srcdir)/modules/intersci/includes/ \
                        -I$(top_srcdir)/modules/scicos_blocks/includes/ \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
                        -I$(top_srcdir)/modules/time/includes/ \
index 7eb7d51..7cdc210 100644 (file)
@@ -1057,7 +1057,6 @@ libsciscicos_la_LDFLAGS = $(AM_LDFLAGS)
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/dynamic_link/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/string/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/localization/includes/ \
-@XCOS_TRUE@                    -I$(top_srcdir)/modules/intersci/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/scicos_blocks/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/action_binding/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/time/includes/ \
index b55836d..8a7a663 100644 (file)
@@ -98,7 +98,6 @@ libscistring_la_CPPFLAGS= \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/functions_manager/includes \
-       -I$(top_srcdir)/modules/elementary_funcions/includes \
        -I$(top_srcdir)/modules/core/includes \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/threads/includes \
@@ -137,13 +136,13 @@ modulename=string
 libscistring_la_rootdir = $(mydatadir)
 libscistring_la_root_DATA =  license.txt
 
-#### string : init scripts ####
+####�string : init scripts ####
 libscistring_la_etcdir = $(mydatadir)/etc
 libscistring_la_etc_DATA = \
     etc/string.quit \
     etc/string.start
 
-#### string : gateway declaration ####
+####�string : gateway declaration ####
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
index cfe0b89..1ea27d0 100644 (file)
@@ -704,7 +704,6 @@ libscistring_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/functions_manager/includes \
-       -I$(top_srcdir)/modules/elementary_funcions/includes \
        -I$(top_srcdir)/modules/core/includes \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/threads/includes \
@@ -735,14 +734,14 @@ modulename = string
 libscistring_la_rootdir = $(mydatadir)
 libscistring_la_root_DATA = license.txt
 
-#### string : init scripts ####
+####�string : init scripts ####
 libscistring_la_etcdir = $(mydatadir)/etc
 libscistring_la_etc_DATA = \
     etc/string.quit \
     etc/string.start
 
 
-#### string : gateway declaration ####
+####�string : gateway declaration ####
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
index 0447c0d..ebf12d3 100644 (file)
@@ -122,7 +122,7 @@ libscitypes_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/console/includes \
-       -I src/cpp \
+       -I$(srcdir)/src/cpp \
     $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
index fb22ba8..7706b28 100644 (file)
@@ -786,7 +786,7 @@ libscitypes_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/console/includes \
-       -I src/cpp \
+       -I$(srcdir)/src/cpp \
     $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)