Clean CFLAGS (remove non-existing paths) 38/14538/2
Vincent COUVERT [Mon, 19 May 2014 09:41:12 +0000 (11:41 +0200)]
Change-Id: I0fa069af85c27c4e1d7ea3a20042136dfaaf4bf4

23 files changed:
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in

index ffff156..64fd61d 100644 (file)
@@ -61,7 +61,6 @@ libscicompletion_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/external_objects/includes \
     $(JAVA_JNI_INCLUDE) \
     $(XML_FLAGS) \
-    $(COMPLETION_FLAGS) \
     $(AM_CPPFLAGS)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index a34a92e..de173ad 100644 (file)
@@ -641,7 +641,6 @@ libscicompletion_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/external_objects/includes \
     $(JAVA_JNI_INCLUDE) \
     $(XML_FLAGS) \
-    $(COMPLETION_FLAGS) \
     $(AM_CPPFLAGS)
 
 
index 1e5c806..5ae0594 100644 (file)
@@ -378,7 +378,6 @@ libdummy_elementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 
 # Includes need for the compilation
 libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
-       -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/core/src/c/ \
index 9b501a4..16f8707 100644 (file)
@@ -1237,7 +1237,6 @@ libdummy_elementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 
 # Includes need for the compilation
 libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
-       -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/core/src/c/ \
index 34c63dd..cf92e02 100644 (file)
@@ -121,14 +121,12 @@ libsciexternal_objects_la_CFLAGS= -I$(srcdir)/includes/ \
 
 libsciexternal_objects_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
     -I$(top_srcdir)/modules/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
     -I$(top_srcdir)/modules/string/includes \
     -I$(top_srcdir)/modules/fileio/includes \
-    -I$(top_srcdir)/modules/core/src/c \
-    $(EXTERNAL_OBJECTS_FLAGS)
+    -I$(top_srcdir)/modules/core/src/c
 
 
 pkglib_LTLIBRARIES = libsciexternal_objects.la 
index 77fe95d..235ffef 100644 (file)
@@ -812,14 +812,12 @@ libsciexternal_objects_la_CFLAGS = -I$(srcdir)/includes/ \
 
 libsciexternal_objects_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
     -I$(top_srcdir)/modules/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
     -I$(top_srcdir)/modules/string/includes \
     -I$(top_srcdir)/modules/fileio/includes \
-    -I$(top_srcdir)/modules/core/src/c \
-    $(EXTERNAL_OBJECTS_FLAGS)
+    -I$(top_srcdir)/modules/core/src/c
 
 pkglib_LTLIBRARIES = libsciexternal_objects.la 
 noinst_LTLIBRARIES = libsciexternal_objects-algo.la 
index 25e37ee..0917ecd 100644 (file)
@@ -91,9 +91,7 @@ libsciexternal_objects_java_la_CFLAGS= -I$(srcdir)/includes/ \
 
 libsciexternal_objects_java_la_CPPFLAGS = -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/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
index ab56404..c907215 100644 (file)
@@ -743,9 +743,7 @@ libsciexternal_objects_java_la_CFLAGS = -I$(srcdir)/includes/ \
 
 libsciexternal_objects_java_la_CPPFLAGS = -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/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
index 661fe6f..3f71928 100644 (file)
@@ -465,8 +465,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
-       -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
index d0e86fa..2fc3596 100644 (file)
@@ -1420,8 +1420,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
-       -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
index 617d1c1..e7ff44d 100755 (executable)
@@ -226,7 +226,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/hashtable/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/console/includes/ \
@@ -247,7 +246,7 @@ libscigui_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/renderer/src/cpp/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
-                       $(Tk_INC_PATH) \
+                       $(TK_INC_PATH) \
                        $(AM_CPPFLAGS)
 
 # Without the GUI module
index 1c316dc..2d33209 100644 (file)
@@ -900,7 +900,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/hashtable/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/console/includes/ \
@@ -921,7 +920,7 @@ libscigui_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/renderer/src/cpp/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
-                       $(Tk_INC_PATH) \
+                       $(TK_INC_PATH) \
                        $(AM_CPPFLAGS)
 
 
index f519bfd..4c492fd 100644 (file)
@@ -89,7 +89,6 @@ FORCE_HDF_1.8_API =  -DH5Dopen_vers=2 -DH5Topen_vers=2 -DH5Dcreate_vers=2 -DH5Ai
 libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(srcdir)/src/cpp/ \
-                               -I$(srcdir)/src/jni/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                 -I$(top_srcdir)/modules/jvm/includes/ \
index 0394519..de7c7f4 100644 (file)
@@ -670,7 +670,6 @@ FORCE_HDF_1.8_API = -DH5Dopen_vers=2 -DH5Topen_vers=2 -DH5Dcreate_vers=2 -DH5Ait
 libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(srcdir)/src/cpp/ \
-                               -I$(srcdir)/src/jni/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                 -I$(top_srcdir)/modules/jvm/includes/ \
index 22497e3..be8b26b 100644 (file)
@@ -977,9 +977,9 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@install-html-local:
-@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
index 6882f2e..eb32386 100644 (file)
@@ -46,7 +46,6 @@ endif
 
 libscimatio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(srcdir)/src/matio/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
index 77b32d0..5d4cd26 100644 (file)
@@ -669,7 +669,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @MATIO_TRUE@libscimatio_la_LDFLAGS = $(AM_LDFLAGS)
 libscimatio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(srcdir)/src/matio/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
index 0b28060..a2540ec 100644 (file)
@@ -58,7 +58,6 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_addModulePreferences.cpp \
 
 libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/jni/ \
     $(XML_FLAGS) \
index a3301b8..f301593 100644 (file)
@@ -622,7 +622,6 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_addModulePreferences.cpp \
 
 libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/jni/ \
     $(XML_FLAGS) \
index a8deec0..7deb915 100644 (file)
@@ -42,7 +42,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
                                -I$(top_srcdir)/modules/graphics/includes/ \
-                               -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/graphic_export/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
index 47768fb..ce5f992 100644 (file)
@@ -555,7 +555,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
                                -I$(top_srcdir)/modules/graphics/includes/ \
-                               -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/graphic_export/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
index 23ab199..852ccac 100644 (file)
@@ -45,7 +45,6 @@ libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/sci_gateway/cpp/ \
 -I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
--I$(top_srcdir)/modules/elementary_functions/src/cpp/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
index 95415a0..246bd5e 100644 (file)
@@ -614,7 +614,6 @@ libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/sci_gateway/cpp/ \
 -I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
--I$(top_srcdir)/modules/elementary_functions/src/cpp/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \