Can now specify GIWS options in Makefile 34/13134/4
Calixte DENIZET [Tue, 12 Nov 2013 16:41:57 +0000 (17:41 +0100)]
Change-Id: I6886adac598a3eec0a9a99d166926bec99728a0f

79 files changed:
scilab/Makefile.incl.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/mpi/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.in

index b9cf439..4529e27 100644 (file)
@@ -106,11 +106,17 @@ if GIWS
 
 ## build Swig Java => C wrappers
 giws: $(GIWS_WRAPPERS)
-       @GIWS_OUTPUTDIR=src/jni/;\
+       @GIWS_OUTPUTDIR=src/jni/; \
+       MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
        if test -n "$(GIWS_WRAPPERS)"; then \
                for file in $(GIWS_WRAPPERS) ; do \
                        echo "GIWS process of $$file ..."; \
-                       $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+                       if test -z "$(GIWS_OPTIONS)"; then \
+                               $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+                       else \
+                               echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+                               $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+                       fi \
                done; \
        fi
 
index 2d6db25..cd04632 100644 (file)
@@ -1231,11 +1231,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 9569e5d..fb2a292 100644 (file)
@@ -1227,11 +1227,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 07344d9..a5479c7 100644 (file)
@@ -1157,11 +1157,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 71674ad..ab1420a 100644 (file)
@@ -878,11 +878,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index f9d3155..7922431 100644 (file)
@@ -1197,11 +1197,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1b64554..7b562e0 100644 (file)
@@ -2030,11 +2030,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index de1e9f1..6712300 100644 (file)
@@ -1186,11 +1186,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 6829bcc..47f9722 100644 (file)
@@ -1197,11 +1197,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 2b245e8..214eab0 100644 (file)
@@ -836,11 +836,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 9523424..a22a6ef 100644 (file)
@@ -1515,11 +1515,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 60aa672..2d2e771 100644 (file)
@@ -1678,11 +1678,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 215c4fd..77e6b0f 100644 (file)
@@ -3185,11 +3185,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1d07d30..19fbcb8 100644 (file)
@@ -1370,11 +1370,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1d8752c..6ec680d 100644 (file)
@@ -861,11 +861,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 969083e..b5ceee4 100644 (file)
@@ -863,11 +863,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index f733626..d59c15c 100644 (file)
@@ -1774,11 +1774,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 83007fe..8a9dff8 100644 (file)
@@ -1159,11 +1159,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index fef129e..85344d4 100644 (file)
@@ -1385,11 +1385,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 785df79..b55a1f4 100644 (file)
@@ -3026,11 +3026,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index c496d9c..14cd6dc 100644 (file)
@@ -1986,11 +1986,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1a5893c..abb3046 100644 (file)
@@ -75,6 +75,7 @@ sci_gateway/cpp/sci_jinvoke_db.cpp
 GIWS_WRAPPERS = src/jni/ScilabObjects.giws.xml
 
 if GIWS
+GIWS_OPTIONS=--enable-return-size-array
 BUILT_SOURCES=giws
 endif
 
index 59187a9..82be00f 100644 (file)
@@ -722,6 +722,7 @@ sci_gateway/cpp/sci_jgetinfo.cpp \
 sci_gateway/cpp/sci_jinvoke_db.cpp
 
 GIWS_WRAPPERS = src/jni/ScilabObjects.giws.xml
+@GIWS_TRUE@GIWS_OPTIONS = --enable-return-size-array
 @GIWS_TRUE@BUILT_SOURCES = giws
 GATEWAY_CPP_SOURCES = 
 libsciexternal_objects_java_la_CFLAGS = -I$(srcdir)/includes/ \
@@ -1624,11 +1625,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 6b16a85..788b85b 100644 (file)
@@ -1337,11 +1337,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 3294b56..0b5a7a7 100644 (file)
@@ -2121,11 +2121,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 3c73736..764cb44 100644 (file)
@@ -1257,11 +1257,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 7585ff1..7770fd6 100644 (file)
@@ -837,11 +837,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 2ea7c2c..28a03b6 100644 (file)
@@ -839,11 +839,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 2535dd8..e87dc1d 100644 (file)
@@ -1356,11 +1356,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ecc31f0..eadc01a 100644 (file)
@@ -1623,11 +1623,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 6c9682b..7dfa898 100644 (file)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -1516,10 +1544,13 @@ clean-pkglibLTLIBRARIES:
          echo rm -f $${locs}; \
          rm -f $${locs}; \
        }
+
 libscigraphics-algo.la: $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_DEPENDENCIES) $(EXTRA_libscigraphics_algo_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) $(am_libscigraphics_algo_la_rpath) $(libscigraphics_algo_la_OBJECTS) $(libscigraphics_algo_la_LIBADD) $(LIBS)
+
 libscigraphics-disable.la: $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_DEPENDENCIES) $(EXTRA_libscigraphics_disable_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_LIBADD) $(LIBS)
+
 libscigraphics.la: $(libscigraphics_la_OBJECTS) $(libscigraphics_la_DEPENDENCIES) $(EXTRA_libscigraphics_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) $(am_libscigraphics_la_rpath) $(libscigraphics_la_OBJECTS) $(libscigraphics_la_LIBADD) $(LIBS)
 
@@ -1923,14 +1954,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -5027,11 +5058,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index d944031..954ee4d 100644 (file)
@@ -2767,11 +2767,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 2856c00..eba1983 100644 (file)
@@ -1788,11 +1788,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index f1fa36f..e8ad22c 100644 (file)
@@ -1396,11 +1396,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index f4cb2bb..c015694 100644 (file)
@@ -1205,11 +1205,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 527980e..ef4f4fd 100644 (file)
@@ -1398,11 +1398,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index c3787dd..5bf3741 100644 (file)
@@ -1812,11 +1812,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ef29c5f..4527176 100644 (file)
@@ -1262,11 +1262,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ac34bea..560cba0 100644 (file)
@@ -1327,11 +1327,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index fc7a620..75a97cf 100644 (file)
@@ -1346,11 +1346,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index dde1a56..177c833 100644 (file)
@@ -936,10 +936,10 @@ 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@install-data-local:
+@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
+@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-html-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
@@ -1089,11 +1089,17 @@ uninstall-am: uninstall-libjavasci2_la_etcDATA \
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@@JAVASCI_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@@JAVASCI_TRUE@      @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@@JAVASCI_TRUE@      @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@@JAVASCI_TRUE@      MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@@JAVASCI_TRUE@      if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@@JAVASCI_TRUE@              for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@@JAVASCI_TRUE@                      echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@@JAVASCI_TRUE@                      $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@@JAVASCI_TRUE@                      if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@@JAVASCI_TRUE@                              $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@@JAVASCI_TRUE@                      else \
+@GIWS_TRUE@@JAVASCI_TRUE@                              echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@@JAVASCI_TRUE@                              $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@@JAVASCI_TRUE@                      fi \
 @GIWS_TRUE@@JAVASCI_TRUE@              done; \
 @GIWS_TRUE@@JAVASCI_TRUE@      fi
 
index 8d3cf53..d613f94 100644 (file)
@@ -1427,11 +1427,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1b160eb..a9fad9f 100644 (file)
@@ -1598,11 +1598,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 05c7fd1..d1d6465 100644 (file)
@@ -1314,11 +1314,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1ce1e8c..68f3be3 100644 (file)
@@ -833,11 +833,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 99b9347..2b23235 100644 (file)
@@ -1350,11 +1350,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index f7a0ba5..b6847c8 100644 (file)
@@ -1140,11 +1140,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 3bdff4e..b592c78 100644 (file)
@@ -831,11 +831,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 0de1df7..29b8727 100644 (file)
@@ -1236,10 +1236,16 @@ check-code:
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 @GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file;\
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 607c1d0..825c02b 100644 (file)
@@ -1628,11 +1628,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 413bccf..87f81cc 100644 (file)
@@ -1552,11 +1552,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index fc96e46..c228103 100644 (file)
@@ -832,11 +832,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ed59712..a624b9c 100644 (file)
@@ -1184,11 +1184,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 6680bb4..4ae0598 100644 (file)
@@ -1048,11 +1048,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index fdbc078..d5fd275 100644 (file)
@@ -1591,11 +1591,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 064cbb8..af152c1 100644 (file)
@@ -748,11 +748,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ae25a3b..8c5f8b5 100644 (file)
@@ -1323,11 +1323,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 7623907..d70740c 100644 (file)
@@ -1301,11 +1301,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index bb88ab1..c8f2b93 100644 (file)
@@ -1116,11 +1116,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 00a6a37..58743ec 100644 (file)
@@ -2699,11 +2699,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 316af86..bbd90d7 100644 (file)
@@ -4713,11 +4713,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 5c051d7..051055b 100644 (file)
@@ -1250,11 +1250,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 4abe958..46d984d 100644 (file)
@@ -1522,11 +1522,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 38fa1ed..304b68d 100644 (file)
@@ -837,11 +837,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 8d1df27..5402455 100644 (file)
@@ -1080,11 +1080,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ba6d894..fc47fce 100644 (file)
@@ -1878,10 +1878,16 @@ check-code:
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 @GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file;\
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index c15b261..5a6e673 100644 (file)
@@ -1333,11 +1333,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 8b24dab..2dac233 100644 (file)
@@ -1327,11 +1327,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 46c257b..a7802ec 100644 (file)
@@ -1501,11 +1501,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 109c28f..84a82a4 100644 (file)
@@ -1744,11 +1744,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 841c76c..d8a5a06 100644 (file)
@@ -1185,11 +1185,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 5f1e7cb..6882d4a 100644 (file)
@@ -1466,11 +1466,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 7e6e235..13cebe5 100644 (file)
@@ -1207,11 +1207,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index fc23f8e..545d654 100644 (file)
@@ -1255,11 +1255,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 14ac7e3..760a2c9 100644 (file)
@@ -1371,11 +1371,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 1122143..36fb70b 100644 (file)
@@ -1323,11 +1323,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index ce09b22..6ba087f 100644 (file)
@@ -1079,11 +1079,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 075a5e6..0d7f9f4 100644 (file)
@@ -1731,11 +1731,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi
 
index 50e9551..4145588 100644 (file)
@@ -1641,11 +1641,17 @@ check-code:
 # We call the target swig-build on the variable SWIG_WRAPPERS
 
 @GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/; \
+@GIWS_TRUE@    MANDATORY_OPTIONS=--throws-exception-on-error --description-file; \
 @GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
 @GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
 @GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@                    if test -z "$(GIWS_OPTIONS)"; then \
+@GIWS_TRUE@                            $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    else \
+@GIWS_TRUE@                            echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
+@GIWS_TRUE@                            $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
+@GIWS_TRUE@                    fi \
 @GIWS_TRUE@            done; \
 @GIWS_TRUE@    fi