Also install java unitary tests (may contain very usefull tests cases)

Change-Id: I2c20849907dbbd814c6df067672a6fe76486dca9

80 files changed, 246 insertions, 130 deletions

diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index cf67fd5..652ee8f 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -640,13 +640,13 @@ $(top_srcdir)/README_Windows.txt
 
 iconsdir = $(pkgdatadir)/icons/
 icons_DATA = $(top_srcdir)/icons/scilab.xpm \
-icons/puffin_128.xpm \
-icons/puffin_256.xpm \
-icons/puffin_32.xpm \
-icons/puffin_48.xpm \
-icons/puffin.png \
-icons/puffin.icns \
-icons/scilab.icns
+$(top_srcdir)/icons/puffin_128.xpm \
+$(top_srcdir)/icons/puffin_256.xpm \
+$(top_srcdir)/icons/puffin_32.xpm \
+$(top_srcdir)/icons/puffin_48.xpm \
+$(top_srcdir)/icons/puffin.png \
+$(top_srcdir)/icons/puffin.icns \
+$(top_srcdir)/icons/scilab.icns
 
 valgrinddir = $(pkgdatadir)/tools/profiling
 valgrind_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
@@ -662,6 +662,13 @@ DOCMASK = scilab_*_help.jar
 # Path to builded files
 PATHTOHELPFILES = modules/helptools/jar/
 
+# Path javasci to builded files
+PATHTOJAVASCIDOC = modules/javasci/javadoc/
+JAVASCI_DIRS = . resources \
+        org/scilab/modules/javasci/ \
+        org/scilab/modules/types/
+
+
 # Pkgconfig directory
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -1652,8 +1659,11 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
         echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
         $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce)
 
+# Build the public Javadoc (javasci v2 and Java/Scilab types)
+# This is not done in the module itself because its needs also the "types"
+# module
 javadoc:
-        $(JAVADOC) -noindex -nohelp -nonavbar -notree -d $(top_builddir)/modules/helptools/javaHelp/scilab_en_US_help/javadoc -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java org.scilab.modules.javasci org.scilab.modules.types
+        $(JAVADOC) -noindex -nohelp -nonavbar -notree -d $(top_builddir)/modules/javasci/javadoc -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java org.scilab.modules.javasci org.scilab.modules.types
 
 doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
 @BUILD_HELP_TRUE@       -@if test -x $(top_builddir)/scilab-bin; then \
@@ -1721,7 +1731,9 @@ clean-doc:
         echo "rm -f $(top_builddir)/modules/scicos/help/en_US/master_help.xml"; \
         rm -f $(top_builddir)/modules/scicos/help/en_US/master_help.xml; \
         echo "rm -f $(top_builddir)/modules/scicos/jar/"; \
-        rm -rf $(top_builddir)/modules/scicos/jar/
+        rm -rf $(top_builddir)/modules/scicos/jar/; \
+        echo "rm -rf $(top_builddir)/modules/javasci/javadoc"; \
+        rm -rf $(top_builddir)/modules/javasci/javadoc;
 
 clean-tests:
         @if test -x $(top_builddir)/scilab-cli-bin; then \
@@ -1784,6 +1796,16 @@ distclean-generated:
 @BUILD_HELP_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdatadir)/$(PATHTOHELPFILES) ; \
 @BUILD_HELP_TRUE@               done; \
 @BUILD_HELP_TRUE@       fi
+@BUILD_HELP_TRUE@       @$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC); \
+@BUILD_HELP_TRUE@       echo $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC); \
+@BUILD_HELP_TRUE@       for dir in $(JAVASCI_DIRS) ; do \
+@BUILD_HELP_TRUE@               $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC)/$$dir; \
+@BUILD_HELP_TRUE@               echo $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC)/$$dir; \
+@BUILD_HELP_TRUE@                       for file in $(top_builddir)/$(PATHTOJAVASCIDOC)/$(dir)/*; do \
+@BUILD_HELP_TRUE@                           echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC)/$$dir" ; \
+@BUILD_HELP_TRUE@                       $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdatadir)/$(PATHTOJAVASCIDOC)/$$dir ; \
+@BUILD_HELP_TRUE@                       done; \
+@BUILD_HELP_TRUE@       done
 
 .PHONY: macros localization doc
 
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 4986883..e73a75f 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -456,7 +456,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 7fa0f0d..3d1783e 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -446,7 +446,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index b4d03b4..987cf35 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -448,7 +448,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index fa2e45f..58ef93f 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -448,7 +448,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 69353c3..a21f9b5 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -436,7 +436,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 267928f..b3a44ad 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -557,7 +557,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 7b9117c..a0f51c0 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -511,7 +511,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 6a72992..76652e4 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -556,7 +556,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index e5e444a..42ed8bb 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -433,7 +433,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index ff39a86..8c51fb8 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -492,7 +492,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 6c8eebc..9cd294b 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -766,7 +766,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 0f270fe..8f08527 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -493,7 +493,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index 68e360f..3a2c0ab 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -475,7 +475,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 8afea7b..db5457c 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -407,7 +407,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 049d112..fd192f7 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -556,7 +556,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 0228ceb..ebfad89 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -559,7 +559,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 8ea82db..f50b8d0 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -925,7 +925,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 84c8da3..5d1a559 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -549,7 +549,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index b9b3ad3..e16e6fc 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -421,7 +421,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 899c0e9..d9ab640 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -415,7 +415,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index e8c28ce..a57dfd2 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -638,7 +638,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index a6096e2..5fbbbed 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -491,7 +491,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index e4429f1..c547c81 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -537,7 +537,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 61bcff6..e080df8 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -1240,7 +1240,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index b317d5a..d53c8d9 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -518,7 +518,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 00b5081..369e081 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -650,7 +650,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 096c4eb..1becdfa 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -514,7 +514,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 62094aa..d32cc95 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -420,7 +420,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index b684ee4..40ab1f4 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -458,7 +458,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 1aa25a7..d9ac404 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -574,7 +574,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index cb89f25..5155e85 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -1303,7 +1303,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 0d745b9..7672229 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -594,7 +594,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 177e279..2d99388 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -586,7 +586,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index fd9603e..05b4c89 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -620,7 +620,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index 6a971dc..e5e38ac 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -489,7 +489,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 811f317..a92d619 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -588,7 +588,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index f68fa72..c866cae 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -619,7 +619,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 0f5be2d..a03d666 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -517,7 +517,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index a12f6d1..79e3da0 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -495,7 +495,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 8da9dbc..fd07094 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -530,7 +530,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index bbb6124..4e7b4fc 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -118,7 +118,10 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
         "$(DESTDIR)$(libjavasci_la_etcdir)" \
         "$(DESTDIR)$(libjavasci_la_rootdir)" \
         "$(DESTDIR)$(libsciscipad_la_imagesdir)" \
-        "$(DESTDIR)$(libsciscipad_la_specialtestdir)"
+        "$(DESTDIR)$(libsciscipad_la_javadocdir)" \
+        "$(DESTDIR)$(libsciscipad_la_javadocjavascidir)" \
+        "$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)" \
+        "$(DESTDIR)$(libsciscipad_la_javadoctypesdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @JAVASCI_TRUE@libjavasci_la_DEPENDENCIES =  \
 @JAVASCI_TRUE@  $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -177,8 +180,10 @@ SOURCES = $(libjavasci_la_SOURCES) $(libjavasci2_la_SOURCES)
 DIST_SOURCES = $(am__libjavasci_la_SOURCES_DIST) \
         $(am__libjavasci2_la_SOURCES_DIST)
 DATA = $(libjavasci_la_etc_DATA) $(libjavasci_la_root_DATA) \
-        $(libsciscipad_la_images_DATA) \
-        $(libsciscipad_la_specialtest_DATA)
+        $(libsciscipad_la_images_DATA) $(libsciscipad_la_javadoc_DATA) \
+        $(libsciscipad_la_javadocjavasci_DATA) \
+        $(libsciscipad_la_javadocresources_DATA) \
+        $(libsciscipad_la_javadoctypes_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -515,30 +520,47 @@ libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@help/images/SciBooleanClass.gif
 
 
-### javasci : special tests ###
-@JAVASCI_TRUE@libsciscipad_la_specialtestdir = $(mydatadir)/tests
-@JAVASCI_TRUE@libsciscipad_la_specialtest_DATA = tests/unit_tests/Boolean.java \
-@JAVASCI_TRUE@tests/unit_tests/Boolean.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/BooleanArray.java \
-@JAVASCI_TRUE@tests/unit_tests/BooleanArray.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Clf.java \
-@JAVASCI_TRUE@tests/unit_tests/Clf.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Disp.java \
-@JAVASCI_TRUE@tests/unit_tests/Disp.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Exec.java  \
-@JAVASCI_TRUE@tests/unit_tests/Exec.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Real1.java \
-@JAVASCI_TRUE@tests/unit_tests/Real1.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Real2.java \
-@JAVASCI_TRUE@tests/unit_tests/Real2.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Real3.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Real3.java \
-@JAVASCI_TRUE@tests/unit_tests/String1.java \
-@JAVASCI_TRUE@tests/unit_tests/String1.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Strings1.dia.ref \
-@JAVASCI_TRUE@tests/unit_tests/Strings1.java \
-@JAVASCI_TRUE@tests/unit_tests/Strings2.java \
-@JAVASCI_TRUE@tests/unit_tests/Strings2.dia.ref
+### javasci : javadoc ###
+@JAVASCI_TRUE@libsciscipad_la_javadocdir = $(mydatadir)/javadoc/
+@JAVASCI_TRUE@libsciscipad_la_javadoc_DATA = javadoc/overview-summary.html \
+@JAVASCI_TRUE@javadoc/deprecated-list.html \
+@JAVASCI_TRUE@javadoc/allclasses-frame.html \
+@JAVASCI_TRUE@javadoc/serialized-form.html \
+@JAVASCI_TRUE@javadoc/stylesheet.css \
+@JAVASCI_TRUE@javadoc/constant-values.html \
+@JAVASCI_TRUE@javadoc/package-list \
+@JAVASCI_TRUE@javadoc/overview-frame.html \
+@JAVASCI_TRUE@javadoc/allclasses-noframe.html \
+@JAVASCI_TRUE@javadoc/index.html
+
+@JAVASCI_TRUE@libsciscipad_la_javadocresourcesdir = $(mydatadir)/javadoc/resources/
+@JAVASCI_TRUE@libsciscipad_la_javadocresources_DATA = javadoc/resources/inherit.gif
+@JAVASCI_TRUE@libsciscipad_la_javadocjavascidir = $(mydatadir)/javadoc/org/scilab/modules/javasci/
+@JAVASCI_TRUE@libsciscipad_la_javadocjavasci_DATA = javadoc/org/scilab/modules/javasci/JavasciException.ScilabInternalException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.UndefinedVariableException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/Call_Scilab.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.UnknownTypeException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/package-frame.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.UnsupportedTypeException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/package-summary.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/Scilab.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.InitializationException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/javasci/JavasciException.AlreadyRunningException.html
+
+@JAVASCI_TRUE@libsciscipad_la_javadoctypesdir = $(mydatadir)/javadoc/org/scilab/modules/javasci/
+@JAVASCI_TRUE@libsciscipad_la_javadoctypes_DATA = javadoc/org/scilab/modules/types/package-frame.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabIntegerTypeEnum.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/package-summary.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabTypeEnum.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabDouble.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabInteger.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabString.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabTList.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabList.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabMList.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabType.html \
+@JAVASCI_TRUE@javadoc/org/scilab/modules/types/ScilabBoolean.html
 
 @JAVASCI_TRUE@BUILT_SOURCES = $(am__append_1)
 
@@ -593,7 +615,7 @@ libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 # Mask of the Scilab compiled macros
 @JAVASCI_TRUE@MACROBINMASK = *.bin
 # List of the standard directory for tests
-@JAVASCI_TRUE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+@JAVASCI_TRUE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 @JAVASCI_TRUE@pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
@@ -868,26 +890,86 @@ uninstall-libsciscipad_la_imagesDATA:
         test -n "$$files" || exit 0; \
         echo " ( cd '$(DESTDIR)$(libsciscipad_la_imagesdir)' && rm -f" $$files ")"; \
         cd "$(DESTDIR)$(libsciscipad_la_imagesdir)" && rm -f $$files
-install-libsciscipad_la_specialtestDATA: $(libsciscipad_la_specialtest_DATA)
+install-libsciscipad_la_javadocDATA: $(libsciscipad_la_javadoc_DATA)
         @$(NORMAL_INSTALL)
-        test -z "$(libsciscipad_la_specialtestdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscipad_la_specialtestdir)"
-        @list='$(libsciscipad_la_specialtest_DATA)'; test -n "$(libsciscipad_la_specialtestdir)" || list=; \
+        test -z "$(libsciscipad_la_javadocdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscipad_la_javadocdir)"
+        @list='$(libsciscipad_la_javadoc_DATA)'; test -n "$(libsciscipad_la_javadocdir)" || list=; \
         for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
           echo "$$d$$p"; \
         done | $(am__base_list) | \
         while read files; do \
-          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciscipad_la_specialtestdir)'"; \
-          $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciscipad_la_specialtestdir)" || exit $$?; \
+          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciscipad_la_javadocdir)'"; \
+          $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciscipad_la_javadocdir)" || exit $$?; \
         done
 
-uninstall-libsciscipad_la_specialtestDATA:
+uninstall-libsciscipad_la_javadocDATA:
         @$(NORMAL_UNINSTALL)
-        @list='$(libsciscipad_la_specialtest_DATA)'; test -n "$(libsciscipad_la_specialtestdir)" || list=; \
+        @list='$(libsciscipad_la_javadoc_DATA)'; test -n "$(libsciscipad_la_javadocdir)" || list=; \
         files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
         test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(libsciscipad_la_specialtestdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(libsciscipad_la_specialtestdir)" && rm -f $$files
+        echo " ( cd '$(DESTDIR)$(libsciscipad_la_javadocdir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(libsciscipad_la_javadocdir)" && rm -f $$files
+install-libsciscipad_la_javadocjavasciDATA: $(libsciscipad_la_javadocjavasci_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(libsciscipad_la_javadocjavascidir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscipad_la_javadocjavascidir)"
+        @list='$(libsciscipad_la_javadocjavasci_DATA)'; test -n "$(libsciscipad_la_javadocjavascidir)" || list=; \
+        for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          echo "$$d$$p"; \
+        done | $(am__base_list) | \
+        while read files; do \
+          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciscipad_la_javadocjavascidir)'"; \
+          $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciscipad_la_javadocjavascidir)" || exit $$?; \
+        done
+
+uninstall-libsciscipad_la_javadocjavasciDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(libsciscipad_la_javadocjavasci_DATA)'; test -n "$(libsciscipad_la_javadocjavascidir)" || list=; \
+        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        test -n "$$files" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(libsciscipad_la_javadocjavascidir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(libsciscipad_la_javadocjavascidir)" && rm -f $$files
+install-libsciscipad_la_javadocresourcesDATA: $(libsciscipad_la_javadocresources_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(libsciscipad_la_javadocresourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)"
+        @list='$(libsciscipad_la_javadocresources_DATA)'; test -n "$(libsciscipad_la_javadocresourcesdir)" || list=; \
+        for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          echo "$$d$$p"; \
+        done | $(am__base_list) | \
+        while read files; do \
+          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)'"; \
+          $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)" || exit $$?; \
+        done
+
+uninstall-libsciscipad_la_javadocresourcesDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(libsciscipad_la_javadocresources_DATA)'; test -n "$(libsciscipad_la_javadocresourcesdir)" || list=; \
+        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        test -n "$$files" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)" && rm -f $$files
+install-libsciscipad_la_javadoctypesDATA: $(libsciscipad_la_javadoctypes_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(libsciscipad_la_javadoctypesdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciscipad_la_javadoctypesdir)"
+        @list='$(libsciscipad_la_javadoctypes_DATA)'; test -n "$(libsciscipad_la_javadoctypesdir)" || list=; \
+        for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          echo "$$d$$p"; \
+        done | $(am__base_list) | \
+        while read files; do \
+          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciscipad_la_javadoctypesdir)'"; \
+          $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciscipad_la_javadoctypesdir)" || exit $$?; \
+        done
+
+uninstall-libsciscipad_la_javadoctypesDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(libsciscipad_la_javadoctypes_DATA)'; test -n "$(libsciscipad_la_javadoctypesdir)" || list=; \
+        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        test -n "$$files" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(libsciscipad_la_javadoctypesdir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(libsciscipad_la_javadoctypesdir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -979,7 +1061,7 @@ check: $(BUILT_SOURCES)
 @JAVASCI_FALSE@all-local:
 all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 installdirs:
-        for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libjavasci_la_etcdir)" "$(DESTDIR)$(libjavasci_la_rootdir)" "$(DESTDIR)$(libsciscipad_la_imagesdir)" "$(DESTDIR)$(libsciscipad_la_specialtestdir)"; do \
+        for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libjavasci_la_etcdir)" "$(DESTDIR)$(libjavasci_la_rootdir)" "$(DESTDIR)$(libsciscipad_la_imagesdir)" "$(DESTDIR)$(libsciscipad_la_javadocdir)" "$(DESTDIR)$(libsciscipad_la_javadocjavascidir)" "$(DESTDIR)$(libsciscipad_la_javadocresourcesdir)" "$(DESTDIR)$(libsciscipad_la_javadoctypesdir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
 install: $(BUILT_SOURCES)
@@ -1039,7 +1121,10 @@ info-am:
 install-data-am: install-data-local install-libjavasci_la_etcDATA \
         install-libjavasci_la_rootDATA \
         install-libsciscipad_la_imagesDATA \
-        install-libsciscipad_la_specialtestDATA
+        install-libsciscipad_la_javadocDATA \
+        install-libsciscipad_la_javadocjavasciDATA \
+        install-libsciscipad_la_javadocresourcesDATA \
+        install-libsciscipad_la_javadoctypesDATA
 
 install-dvi: install-dvi-am
 
@@ -1088,7 +1173,10 @@ ps-am:
 uninstall-am: uninstall-libjavasci_la_etcDATA \
         uninstall-libjavasci_la_rootDATA \
         uninstall-libsciscipad_la_imagesDATA \
-        uninstall-libsciscipad_la_specialtestDATA \
+        uninstall-libsciscipad_la_javadocDATA \
+        uninstall-libsciscipad_la_javadocjavasciDATA \
+        uninstall-libsciscipad_la_javadocresourcesDATA \
+        uninstall-libsciscipad_la_javadoctypesDATA \
         uninstall-pkglibLTLIBRARIES
 
 .MAKE: all check check-am install install-am install-strip
@@ -1104,7 +1192,10 @@ uninstall-am: uninstall-libjavasci_la_etcDATA \
         install-html-local install-info install-info-am \
         install-libjavasci_la_etcDATA install-libjavasci_la_rootDATA \
         install-libsciscipad_la_imagesDATA \
-        install-libsciscipad_la_specialtestDATA install-man \
+        install-libsciscipad_la_javadocDATA \
+        install-libsciscipad_la_javadocjavasciDATA \
+        install-libsciscipad_la_javadocresourcesDATA \
+        install-libsciscipad_la_javadoctypesDATA install-man \
         install-pdf install-pdf-am install-pkglibLTLIBRARIES \
         install-ps install-ps-am install-strip installcheck \
         installcheck-am installdirs maintainer-clean \
@@ -1113,7 +1204,10 @@ uninstall-am: uninstall-libjavasci_la_etcDATA \
         tags uninstall uninstall-am uninstall-libjavasci_la_etcDATA \
         uninstall-libjavasci_la_rootDATA \
         uninstall-libsciscipad_la_imagesDATA \
-        uninstall-libsciscipad_la_specialtestDATA \
+        uninstall-libsciscipad_la_javadocDATA \
+        uninstall-libsciscipad_la_javadocjavasciDATA \
+        uninstall-libsciscipad_la_javadocresourcesDATA \
+        uninstall-libsciscipad_la_javadoctypesDATA \
         uninstall-pkglibLTLIBRARIES
 
 
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index f453c2d..10d9ac6 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -558,7 +558,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 32e0633..7275122 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -595,7 +595,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index dc2217d..4c7fb4d 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -524,7 +524,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 6134c8f..73c5601 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -418,7 +418,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 95b42ce..72b7b76 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -415,7 +415,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index fa6cca9..9243a97 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -471,7 +471,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index 3ce5b14..47128fa 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -496,7 +496,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/modules_manager/Makefile.in b/scilab/modules/modules_manager/Makefile.in
index c2a6120..26d78dd 100644
--- a/scilab/modules/modules_manager/Makefile.in
+++ b/scilab/modules/modules_manager/Makefile.in
@@ -415,7 +415,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index f9dc783..2e64a3c 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -620,7 +620,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 350b8b6..be04be0 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -590,7 +590,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index a1e3bba..37ac28b 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -416,7 +416,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
index d175a89..2877064 100644
--- a/scilab/modules/parallel/Makefile.in
+++ b/scilab/modules/parallel/Makefile.in
@@ -512,7 +512,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index d516edc..4f1fdfc 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -465,7 +465,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 8189f9d..d2d8f70 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -601,7 +601,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 9fd6918..e993e4f 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -655,9 +655,9 @@ top_srcdir = @top_srcdir@
 # Mask of the Scilab compiled macros
 @PVM_TRUE@MACROBINMASK = *.bin
 # List of the standard directory for tests
-@PVM_FALSE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+@PVM_FALSE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # List of the standard directory for tests
-@PVM_TRUE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+@PVM_TRUE@TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 @PVM_FALSE@pkgdemosdir = $(mydatadir)
 # Where the demos should be installed
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index 6b5fc8a..c81756e 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -516,7 +516,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index dac10bd..58f3b0c 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -1053,7 +1053,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 36f60fc..d9e1160 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -693,7 +693,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index ff2a702..e05cbf9 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -951,7 +951,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
index 5137175..4f07e82 100644
--- a/scilab/modules/scinotes/Makefile.in
+++ b/scilab/modules/scinotes/Makefile.in
@@ -486,7 +486,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index df4c747..ed46a08 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -538,7 +538,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 55cd70a..2ec4366 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -585,7 +585,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 3b72aa3..5a60ce1f 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -420,7 +420,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 7ef5a7b..a610d4d 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -471,7 +471,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index fcdedb9..9b7f5de 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -667,7 +667,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index fdd3445..f2474f3 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -518,7 +518,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 4b10e33..16b1d7e 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -489,7 +489,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 5a23fb5..b38efd5 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -573,7 +573,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 00c5fc6..bbd611b 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -571,7 +571,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 1276892..405fb7e 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -488,7 +488,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 9cc56d7..c4b8571 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -714,7 +714,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index ead5c8c..c81d11c 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -418,7 +418,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 40a1610..16e3ed8 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -490,7 +490,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/types/Makefile.in b/scilab/modules/types/Makefile.in
index 8119889..8a45e7f 100644
--- a/scilab/modules/types/Makefile.in
+++ b/scilab/modules/types/Makefile.in
@@ -458,7 +458,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/ui_data/Makefile.in b/scilab/modules/ui_data/Makefile.in
index e5103ed..5ade6f4 100644
--- a/scilab/modules/ui_data/Makefile.in
+++ b/scilab/modules/ui_data/Makefile.in
@@ -485,7 +485,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index 58f3d84..07fadd6 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -536,7 +536,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 203d0b5..d523621 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -468,7 +468,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index b5695cf..14700e7 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -857,7 +857,7 @@ MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
 # List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 # Where the demos should be installed
 pkgdemosdir = $(mydatadir)
 # List of the standard directory for demos