summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-14 15:46:57 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-09-14 15:46:57 +0200
commit7140d1ed174d6510e98962bb3f96025aa70112f5 (patch)
tree8f38ca595de78d68180aad2a2abe0b1b1ba41d42
parenta542e7896f593e7c542ec0cd1d37d46d18175b01 (diff)
downloadscilab-7140d1ed174d6510e98962bb3f96025aa70112f5.zip
scilab-7140d1ed174d6510e98962bb3f96025aa70112f5.tar.gz
Regenerate configure / makefiles
-rwxr-xr-xscilab/configure183
-rw-r--r--scilab/modules/Makefile.am11
-rw-r--r--scilab/modules/Makefile.in7
-rw-r--r--scilab/modules/xcos/Makefile.in264
-rw-r--r--scilab/modules/xpad/Makefile.in1
5 files changed, 301 insertions, 165 deletions
diff --git a/scilab/configure b/scilab/configure
index 414e923..2dae2dc 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -887,6 +887,7 @@ JOGL
887SKINLF 887SKINLF
888LOOKS 888LOOKS
889FLEXDOCK 889FLEXDOCK
890JGRAPHX
890ANT 891ANT
891JDB 892JDB
892JAR 893JAR
@@ -9813,7 +9814,7 @@ $as_echo "$ac_java_classpath" >&6; }
9813$as_echo_n "checking to see if the java compiler works... " >&6; } 9814$as_echo_n "checking to see if the java compiler works... " >&6; }
9814 9815
9815 cat << \EOF > conftest.java 9816 cat << \EOF > conftest.java
9816// #line 9816 "configure" 9817// #line 9817 "configure"
9817 9818
9818 9819
9819public class conftest { 9820public class conftest {
@@ -9861,7 +9862,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9861 if test "x$ac_java_jvm_name" = "x" ; then 9862 if test "x$ac_java_jvm_name" = "x" ; then
9862 9863
9863 cat << \EOF > conftest.java 9864 cat << \EOF > conftest.java
9864// #line 9864 "configure" 9865// #line 9865 "configure"
9865import gnu.java.io.EncodingManager; 9866import gnu.java.io.EncodingManager;
9866 9867
9867public class conftest { 9868public class conftest {
@@ -9907,7 +9908,7 @@ $as_echo_n "checking java API version... " >&6; }
9907 9908
9908 9909
9909 cat << \EOF > conftest.java 9910 cat << \EOF > conftest.java
9910// #line 9910 "configure" 9911// #line 9911 "configure"
9911import java.nio.charset.Charset; 9912import java.nio.charset.Charset;
9912 9913
9913public class conftest { 9914public class conftest {
@@ -9934,7 +9935,7 @@ EOF
9934 9935
9935 9936
9936 cat << \EOF > conftest.java 9937 cat << \EOF > conftest.java
9937// #line 9937 "configure" 9938// #line 9938 "configure"
9938import java.lang.StringBuilder; 9939import java.lang.StringBuilder;
9939 9940
9940public class conftest { 9941public class conftest {
@@ -11116,6 +11117,78 @@ fi
11116 11117
11117 if test "$with_gui" != no; then 11118 if test "$with_gui" != no; then
11118 11119
11120 # jgraphx
11121
11122 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5
11123$as_echo_n "checking jgraphx... " >&6; }
11124 PACKAGE_JAR_FILE=
11125 found_jar=no
11126 saved_ac_java_classpath=$ac_java_classpath
11127 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
11128 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11129 for jar in "$jardir/jgraphx.jar" "$jardir/libjgraphx.jar" "$jardir/libjgraphx-java.jar" "$jardir/jgraphx*.jar"; do
11130# jar=`echo $jar|sed -e 's/ /\\ /'`
11131# echo "protected $jar"
11132# jar_resolved=`ls $jar 2>/dev/null`
11133# echo "looking for $jar_resolved"
11134# TODO check the behaviour when spaces
11135 jar_resolved=`ls $jar 2>/dev/null`
11136 if test -e "$jar_resolved"; then
11137 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11138
11139 cat << \EOF > conftest.java
11140// #line 11140 "configure"
11141import com.mxgraph.model.mxCell;
11142
11143public class conftest {
11144 public static void main(String[] argv) {
11145
11146 }
11147}
11148EOF
11149
11150 CLASSPATH=$ac_java_classpath
11151 export CLASSPATH
11152 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
11153 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
11154 echo "yes" >&5
11155
11156 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
11157$as_echo "$jar_resolved" >&6; }
11158 found_jar=yes
11159 PACKAGE_JAR_FILE=$jar_resolved
11160 break
11161
11162 else
11163 echo "configure: failed program was:" >&5
11164 cat conftest.java >&5
11165 echo "configure: CLASSPATH was $CLASSPATH" >&5
11166
11167 ac_java_classpath=$saved_ac_java_classpath
11168
11169
11170 fi
11171
11172 fi
11173 done
11174 if test "$found_jar" = "yes"; then
11175 break
11176 fi
11177 done
11178 if test "$found_jar" = "no"; then
11179 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11180$as_echo "no" >&6; }
11181 if test "" = "yes"; then
11182 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" >&5
11183$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" >&2;}
11184 else
11185 as_fn_error "Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" "$LINENO" 5
11186 fi
11187 fi
11188
11189 JGRAPHX=$PACKAGE_JAR_FILE
11190
11191
11119 # Docking system 11192 # Docking system
11120 11193
11121 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5 11194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
@@ -11136,7 +11209,7 @@ $as_echo_n "checking flexdock... " >&6; }
11136 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11209 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11137 11210
11138 cat << \EOF > conftest.java 11211 cat << \EOF > conftest.java
11139// #line 11139 "configure" 11212// #line 11212 "configure"
11140import org.flexdock.docking.DockingManager; 11213import org.flexdock.docking.DockingManager;
11141 11214
11142public class conftest { 11215public class conftest {
@@ -11208,7 +11281,7 @@ $as_echo_n "checking looks... " >&6; }
11208 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11281 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11209 11282
11210 cat << \EOF > conftest.java 11283 cat << \EOF > conftest.java
11211// #line 11211 "configure" 11284// #line 11284 "configure"
11212import com.jgoodies.looks.common.RenderingUtils; 11285import com.jgoodies.looks.common.RenderingUtils;
11213 11286
11214public class conftest { 11287public class conftest {
@@ -11280,7 +11353,7 @@ $as_echo_n "checking looks2... " >&6; }
11280 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11353 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11281 11354
11282 cat << \EOF > conftest.java 11355 cat << \EOF > conftest.java
11283// #line 11283 "configure" 11356// #line 11356 "configure"
11284import com.jgoodies.looks.common.RenderingUtils; 11357import com.jgoodies.looks.common.RenderingUtils;
11285 11358
11286public class conftest { 11359public class conftest {
@@ -11355,7 +11428,7 @@ $as_echo_n "checking skinlf... " >&6; }
11355 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11428 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11356 11429
11357 cat << \EOF > conftest.java 11430 cat << \EOF > conftest.java
11358// #line 11358 "configure" 11431// #line 11431 "configure"
11359import com.l2fprod.util.AccessUtils; 11432import com.l2fprod.util.AccessUtils;
11360 11433
11361public class conftest { 11434public class conftest {
@@ -11427,7 +11500,7 @@ $as_echo_n "checking jogl... " >&6; }
11427 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11500 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11428 11501
11429 cat << \EOF > conftest.java 11502 cat << \EOF > conftest.java
11430// #line 11430 "configure" 11503// #line 11503 "configure"
11431import javax.media.opengl.glu.GLUnurbs; 11504import javax.media.opengl.glu.GLUnurbs;
11432 11505
11433public class conftest { 11506public class conftest {
@@ -11499,7 +11572,7 @@ $as_echo_n "checking jhall... " >&6; }
11499 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11572 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11500 11573
11501 cat << \EOF > conftest.java 11574 cat << \EOF > conftest.java
11502// #line 11502 "configure" 11575// #line 11575 "configure"
11503import javax.help.JHelp; 11576import javax.help.JHelp;
11504 11577
11505public class conftest { 11578public class conftest {
@@ -11571,7 +11644,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11571 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11644 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11572 11645
11573 cat << \EOF > conftest.java 11646 cat << \EOF > conftest.java
11574// #line 11574 "configure" 11647// #line 11647 "configure"
11575import javax.help.JHelp; 11648import javax.help.JHelp;
11576 11649
11577public class conftest { 11650public class conftest {
@@ -11644,7 +11717,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11644 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11717 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11645 11718
11646 cat << \EOF > conftest.java 11719 cat << \EOF > conftest.java
11647// #line 11647 "configure" 11720// #line 11720 "configure"
11648import com.sun.gluegen.runtime.CPU; 11721import com.sun.gluegen.runtime.CPU;
11649 11722
11650public class conftest { 11723public class conftest {
@@ -11716,7 +11789,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11716 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11789 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11717 11790
11718 cat << \EOF > conftest.java 11791 cat << \EOF > conftest.java
11719// #line 11719 "configure" 11792// #line 11792 "configure"
11720import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 11793import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11721 11794
11722public class conftest { 11795public class conftest {
@@ -11788,7 +11861,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11788 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11861 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11789 11862
11790 cat << \EOF > conftest.java 11863 cat << \EOF > conftest.java
11791// #line 11791 "configure" 11864// #line 11864 "configure"
11792import com.artenum.rosetta.core.action.AbstractConsoleAction; 11865import com.artenum.rosetta.core.action.AbstractConsoleAction;
11793 11866
11794public class conftest { 11867public class conftest {
@@ -11861,7 +11934,7 @@ $as_echo_n "checking jhdf5... " >&6; }
11861 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11934 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11862 11935
11863 cat << \EOF > conftest.java 11936 cat << \EOF > conftest.java
11864// #line 11864 "configure" 11937// #line 11937 "configure"
11865import ncsa.hdf.hdf5lib.HDF5Constants; 11938import ncsa.hdf.hdf5lib.HDF5Constants;
11866 11939
11867public class conftest { 11940public class conftest {
@@ -11934,7 +12007,7 @@ $as_echo_n "checking commons-logging... " >&6; }
11934 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12007 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11935 12008
11936 cat << \EOF > conftest.java 12009 cat << \EOF > conftest.java
11937// #line 11937 "configure" 12010// #line 12010 "configure"
11938import org.apache.commons.logging.LogFactory; 12011import org.apache.commons.logging.LogFactory;
11939 12012
11940public class conftest { 12013public class conftest {
@@ -20021,7 +20094,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20021{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20094{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20022$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20095$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20023cat > conftest.$ac_ext <<EOF 20096cat > conftest.$ac_ext <<EOF
20024#line 20024 "configure" 20097#line 20097 "configure"
20025#include "confdefs.h" 20098#include "confdefs.h"
20026 20099
20027#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20100#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20333,7 +20406,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20333$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20406$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20334 20407
20335cat > conftest.$ac_ext <<EOF 20408cat > conftest.$ac_ext <<EOF
20336#line 20336 "configure" 20409#line 20409 "configure"
20337#include "confdefs.h" 20410#include "confdefs.h"
20338 20411
20339#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20412#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -20914,7 +20987,7 @@ $as_echo_n "checking batik-all... " >&6; }
20914 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 20987 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
20915 20988
20916 cat << \EOF > conftest.java 20989 cat << \EOF > conftest.java
20917// #line 20917 "configure" 20990// #line 20990 "configure"
20918import org.apache.batik.parser.Parser; 20991import org.apache.batik.parser.Parser;
20919 20992
20920public class conftest { 20993public class conftest {
@@ -20986,7 +21059,7 @@ $as_echo_n "checking batik... " >&6; }
20986 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21059 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
20987 21060
20988 cat << \EOF > conftest.java 21061 cat << \EOF > conftest.java
20989// #line 20989 "configure" 21062// #line 21062 "configure"
20990import org.apache.batik.parser.Parser; 21063import org.apache.batik.parser.Parser;
20991 21064
20992public class conftest { 21065public class conftest {
@@ -21060,7 +21133,7 @@ $as_echo_n "checking saxon... " >&6; }
21060 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21133 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21061 21134
21062 cat << \EOF > conftest.java 21135 cat << \EOF > conftest.java
21063// #line 21063 "configure" 21136// #line 21136 "configure"
21064import com.icl.saxon.Loader; 21137import com.icl.saxon.Loader;
21065 21138
21066public class conftest { 21139public class conftest {
@@ -21132,7 +21205,7 @@ $as_echo_n "checking fop... " >&6; }
21132 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21205 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21133 21206
21134 cat << \EOF > conftest.java 21207 cat << \EOF > conftest.java
21135// #line 21135 "configure" 21208// #line 21208 "configure"
21136import org.apache.fop.pdf.PDFInfo; 21209import org.apache.fop.pdf.PDFInfo;
21137 21210
21138public class conftest { 21211public class conftest {
@@ -21204,7 +21277,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21204 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21277 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21205 21278
21206 cat << \EOF > conftest.java 21279 cat << \EOF > conftest.java
21207// #line 21207 "configure" 21280// #line 21280 "configure"
21208import net.sourceforge.jeuclid.LayoutContext; 21281import net.sourceforge.jeuclid.LayoutContext;
21209 21282
21210public class conftest { 21283public class conftest {
@@ -21276,7 +21349,7 @@ $as_echo_n "checking commons-io... " >&6; }
21276 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21349 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21277 21350
21278 cat << \EOF > conftest.java 21351 cat << \EOF > conftest.java
21279// #line 21279 "configure" 21352// #line 21352 "configure"
21280import org.apache.commons.io.output.CountingOutputStream; 21353import org.apache.commons.io.output.CountingOutputStream;
21281 21354
21282public class conftest { 21355public class conftest {
@@ -21348,7 +21421,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21348 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21421 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21349 21422
21350 cat << \EOF > conftest.java 21423 cat << \EOF > conftest.java
21351// #line 21351 "configure" 21424// #line 21424 "configure"
21352import org.apache.xmlgraphics.util.Service; 21425import org.apache.xmlgraphics.util.Service;
21353 21426
21354public class conftest { 21427public class conftest {
@@ -21420,7 +21493,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21420 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21493 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21421 21494
21422 cat << \EOF > conftest.java 21495 cat << \EOF > conftest.java
21423// #line 21423 "configure" 21496// #line 21496 "configure"
21424import org.w3c.dom.svg.SVGDocument; 21497import org.w3c.dom.svg.SVGDocument;
21425 21498
21426public class conftest { 21499public class conftest {
@@ -21493,7 +21566,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21493 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21566 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21494 21567
21495 cat << \EOF > conftest.java 21568 cat << \EOF > conftest.java
21496// #line 21496 "configure" 21569// #line 21569 "configure"
21497import org.apache.avalon.framework.configuration.ConfigurationException; 21570import org.apache.avalon.framework.configuration.ConfigurationException;
21498 21571
21499public class conftest { 21572public class conftest {
@@ -22151,13 +22224,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
22151else 22224else
22152 lt_cv_nm_interface="BSD nm" 22225 lt_cv_nm_interface="BSD nm"
22153 echo "int some_variable = 0;" > conftest.$ac_ext 22226 echo "int some_variable = 0;" > conftest.$ac_ext
22154 (eval echo "\"\$as_me:22154: $ac_compile\"" >&5) 22227 (eval echo "\"\$as_me:22227: $ac_compile\"" >&5)
22155 (eval "$ac_compile" 2>conftest.err) 22228 (eval "$ac_compile" 2>conftest.err)
22156 cat conftest.err >&5 22229 cat conftest.err >&5
22157 (eval echo "\"\$as_me:22157: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 22230 (eval echo "\"\$as_me:22230: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
22158 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 22231 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
22159 cat conftest.err >&5 22232 cat conftest.err >&5
22160 (eval echo "\"\$as_me:22160: output\"" >&5) 22233 (eval echo "\"\$as_me:22233: output\"" >&5)
22161 cat conftest.out >&5 22234 cat conftest.out >&5
22162 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 22235 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
22163 lt_cv_nm_interface="MS dumpbin" 22236 lt_cv_nm_interface="MS dumpbin"
@@ -23351,7 +23424,7 @@ ia64-*-hpux*)
23351 ;; 23424 ;;
23352*-*-irix6*) 23425*-*-irix6*)
23353 # Find out which ABI we are using. 23426 # Find out which ABI we are using.
23354 echo '#line 23354 "configure"' > conftest.$ac_ext 23427 echo '#line 23427 "configure"' > conftest.$ac_ext
23355 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 23428 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
23356 (eval $ac_compile) 2>&5 23429 (eval $ac_compile) 2>&5
23357 ac_status=$? 23430 ac_status=$?
@@ -25374,11 +25447,11 @@ else
25374 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25447 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25375 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25448 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25376 -e 's:$: $lt_compiler_flag:'` 25449 -e 's:$: $lt_compiler_flag:'`
25377 (eval echo "\"\$as_me:25377: $lt_compile\"" >&5) 25450 (eval echo "\"\$as_me:25450: $lt_compile\"" >&5)
25378 (eval "$lt_compile" 2>conftest.err) 25451 (eval "$lt_compile" 2>conftest.err)
25379 ac_status=$? 25452 ac_status=$?
25380 cat conftest.err >&5 25453 cat conftest.err >&5
25381 echo "$as_me:25381: \$? = $ac_status" >&5 25454 echo "$as_me:25454: \$? = $ac_status" >&5
25382 if (exit $ac_status) && test -s "$ac_outfile"; then 25455 if (exit $ac_status) && test -s "$ac_outfile"; then
25383 # The compiler can only warn and ignore the option if not recognized 25456 # The compiler can only warn and ignore the option if not recognized
25384 # So say no if there are warnings other than the usual output. 25457 # So say no if there are warnings other than the usual output.
@@ -25713,11 +25786,11 @@ else
25713 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25786 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25714 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25787 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25715 -e 's:$: $lt_compiler_flag:'` 25788 -e 's:$: $lt_compiler_flag:'`
25716 (eval echo "\"\$as_me:25716: $lt_compile\"" >&5) 25789 (eval echo "\"\$as_me:25789: $lt_compile\"" >&5)
25717 (eval "$lt_compile" 2>conftest.err) 25790 (eval "$lt_compile" 2>conftest.err)
25718 ac_status=$? 25791 ac_status=$?
25719 cat conftest.err >&5 25792 cat conftest.err >&5
25720 echo "$as_me:25720: \$? = $ac_status" >&5 25793 echo "$as_me:25793: \$? = $ac_status" >&5
25721 if (exit $ac_status) && test -s "$ac_outfile"; then 25794 if (exit $ac_status) && test -s "$ac_outfile"; then
25722 # The compiler can only warn and ignore the option if not recognized 25795 # The compiler can only warn and ignore the option if not recognized
25723 # So say no if there are warnings other than the usual output. 25796 # So say no if there are warnings other than the usual output.
@@ -25818,11 +25891,11 @@ else
25818 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25891 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25819 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25892 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25820 -e 's:$: $lt_compiler_flag:'` 25893 -e 's:$: $lt_compiler_flag:'`
25821 (eval echo "\"\$as_me:25821: $lt_compile\"" >&5) 25894 (eval echo "\"\$as_me:25894: $lt_compile\"" >&5)
25822 (eval "$lt_compile" 2>out/conftest.err) 25895 (eval "$lt_compile" 2>out/conftest.err)
25823 ac_status=$? 25896 ac_status=$?
25824 cat out/conftest.err >&5 25897 cat out/conftest.err >&5
25825 echo "$as_me:25825: \$? = $ac_status" >&5 25898 echo "$as_me:25898: \$? = $ac_status" >&5
25826 if (exit $ac_status) && test -s out/conftest2.$ac_objext 25899 if (exit $ac_status) && test -s out/conftest2.$ac_objext
25827 then 25900 then
25828 # The compiler can only warn and ignore the option if not recognized 25901 # The compiler can only warn and ignore the option if not recognized
@@ -25873,11 +25946,11 @@ else
25873 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25946 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25874 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25947 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25875 -e 's:$: $lt_compiler_flag:'` 25948 -e 's:$: $lt_compiler_flag:'`
25876 (eval echo "\"\$as_me:25876: $lt_compile\"" >&5) 25949 (eval echo "\"\$as_me:25949: $lt_compile\"" >&5)
25877 (eval "$lt_compile" 2>out/conftest.err) 25950 (eval "$lt_compile" 2>out/conftest.err)
25878 ac_status=$? 25951 ac_status=$?
25879 cat out/conftest.err >&5 25952 cat out/conftest.err >&5
25880 echo "$as_me:25880: \$? = $ac_status" >&5 25953 echo "$as_me:25953: \$? = $ac_status" >&5
25881 if (exit $ac_status) && test -s out/conftest2.$ac_objext 25954 if (exit $ac_status) && test -s out/conftest2.$ac_objext
25882 then 25955 then
25883 # The compiler can only warn and ignore the option if not recognized 25956 # The compiler can only warn and ignore the option if not recognized
@@ -28320,7 +28393,7 @@ else
28320 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28393 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28321 lt_status=$lt_dlunknown 28394 lt_status=$lt_dlunknown
28322 cat > conftest.$ac_ext <<_LT_EOF 28395 cat > conftest.$ac_ext <<_LT_EOF
28323#line 28323 "configure" 28396#line 28396 "configure"
28324#include "confdefs.h" 28397#include "confdefs.h"
28325 28398
28326#if HAVE_DLFCN_H 28399#if HAVE_DLFCN_H
@@ -28416,7 +28489,7 @@ else
28416 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28489 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28417 lt_status=$lt_dlunknown 28490 lt_status=$lt_dlunknown
28418 cat > conftest.$ac_ext <<_LT_EOF 28491 cat > conftest.$ac_ext <<_LT_EOF
28419#line 28419 "configure" 28492#line 28492 "configure"
28420#include "confdefs.h" 28493#include "confdefs.h"
28421 28494
28422#if HAVE_DLFCN_H 28495#if HAVE_DLFCN_H
@@ -30388,11 +30461,11 @@ else
30388 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30461 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30389 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30462 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30390 -e 's:$: $lt_compiler_flag:'` 30463 -e 's:$: $lt_compiler_flag:'`
30391 (eval echo "\"\$as_me:30391: $lt_compile\"" >&5) 30464 (eval echo "\"\$as_me:30464: $lt_compile\"" >&5)
30392 (eval "$lt_compile" 2>conftest.err) 30465 (eval "$lt_compile" 2>conftest.err)
30393 ac_status=$? 30466 ac_status=$?
30394 cat conftest.err >&5 30467 cat conftest.err >&5
30395 echo "$as_me:30395: \$? = $ac_status" >&5 30468 echo "$as_me:30468: \$? = $ac_status" >&5
30396 if (exit $ac_status) && test -s "$ac_outfile"; then 30469 if (exit $ac_status) && test -s "$ac_outfile"; then
30397 # The compiler can only warn and ignore the option if not recognized 30470 # The compiler can only warn and ignore the option if not recognized
30398 # So say no if there are warnings other than the usual output. 30471 # So say no if there are warnings other than the usual output.
@@ -30487,11 +30560,11 @@ else
30487 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30560 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30488 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30561 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30489 -e 's:$: $lt_compiler_flag:'` 30562 -e 's:$: $lt_compiler_flag:'`
30490 (eval echo "\"\$as_me:30490: $lt_compile\"" >&5) 30563 (eval echo "\"\$as_me:30563: $lt_compile\"" >&5)
30491 (eval "$lt_compile" 2>out/conftest.err) 30564 (eval "$lt_compile" 2>out/conftest.err)
30492 ac_status=$? 30565 ac_status=$?
30493 cat out/conftest.err >&5 30566 cat out/conftest.err >&5
30494 echo "$as_me:30494: \$? = $ac_status" >&5 30567 echo "$as_me:30567: \$? = $ac_status" >&5
30495 if (exit $ac_status) && test -s out/conftest2.$ac_objext 30568 if (exit $ac_status) && test -s out/conftest2.$ac_objext
30496 then 30569 then
30497 # The compiler can only warn and ignore the option if not recognized 30570 # The compiler can only warn and ignore the option if not recognized
@@ -30539,11 +30612,11 @@ else
30539 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30612 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30540 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30613 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30541 -e 's:$: $lt_compiler_flag:'` 30614 -e 's:$: $lt_compiler_flag:'`
30542 (eval echo "\"\$as_me:30542: $lt_compile\"" >&5) 30615 (eval echo "\"\$as_me:30615: $lt_compile\"" >&5)
30543 (eval "$lt_compile" 2>out/conftest.err) 30616 (eval "$lt_compile" 2>out/conftest.err)
30544 ac_status=$? 30617 ac_status=$?
30545 cat out/conftest.err >&5 30618 cat out/conftest.err >&5
30546 echo "$as_me:30546: \$? = $ac_status" >&5 30619 echo "$as_me:30619: \$? = $ac_status" >&5
30547 if (exit $ac_status) && test -s out/conftest2.$ac_objext 30620 if (exit $ac_status) && test -s out/conftest2.$ac_objext
30548 then 30621 then
30549 # The compiler can only warn and ignore the option if not recognized 30622 # The compiler can only warn and ignore the option if not recognized
@@ -31942,11 +32015,11 @@ else
31942 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 32015 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
31943 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 32016 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
31944 -e 's:$: $lt_compiler_flag:'` 32017 -e 's:$: $lt_compiler_flag:'`
31945 (eval echo "\"\$as_me:31945: $lt_compile\"" >&5) 32018 (eval echo "\"\$as_me:32018: $lt_compile\"" >&5)
31946 (eval "$lt_compile" 2>conftest.err) 32019 (eval "$lt_compile" 2>conftest.err)
31947 ac_status=$? 32020 ac_status=$?
31948 cat conftest.err >&5 32021 cat conftest.err >&5
31949 echo "$as_me:31949: \$? = $ac_status" >&5 32022 echo "$as_me:32022: \$? = $ac_status" >&5
31950 if (exit $ac_status) && test -s "$ac_outfile"; then 32023 if (exit $ac_status) && test -s "$ac_outfile"; then
31951 # The compiler can only warn and ignore the option if not recognized 32024 # The compiler can only warn and ignore the option if not recognized
31952 # So say no if there are warnings other than the usual output. 32025 # So say no if there are warnings other than the usual output.
@@ -32041,11 +32114,11 @@ else
32041 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 32114 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
32042 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 32115 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
32043 -e 's:$: $lt_compiler_flag:'` 32116 -e 's:$: $lt_compiler_flag:'`
32044 (eval echo "\"\$as_me:32044: $lt_compile\"" >&5) 32117 (eval echo "\"\$as_me:32117: $lt_compile\"" >&5)
32045 (eval "$lt_compile" 2>out/conftest.err) 32118 (eval "$lt_compile" 2>out/conftest.err)
32046 ac_status=$? 32119 ac_status=$?
32047 cat out/conftest.err >&5 32120 cat out/conftest.err >&5
32048 echo "$as_me:32048: \$? = $ac_status" >&5 32121 echo "$as_me:32121: \$? = $ac_status" >&5
32049 if (exit $ac_status) && test -s out/conftest2.$ac_objext 32122 if (exit $ac_status) && test -s out/conftest2.$ac_objext
32050 then 32123 then
32051 # The compiler can only warn and ignore the option if not recognized 32124 # The compiler can only warn and ignore the option if not recognized
@@ -32093,11 +32166,11 @@ else
32093 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 32166 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
32094 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 32167 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
32095 -e 's:$: $lt_compiler_flag:'` 32168 -e 's:$: $lt_compiler_flag:'`
32096 (eval echo "\"\$as_me:32096: $lt_compile\"" >&5) 32169 (eval echo "\"\$as_me:32169: $lt_compile\"" >&5)
32097 (eval "$lt_compile" 2>out/conftest.err) 32170 (eval "$lt_compile" 2>out/conftest.err)
32098 ac_status=$? 32171 ac_status=$?
32099 cat out/conftest.err >&5 32172 cat out/conftest.err >&5
32100 echo "$as_me:32100: \$? = $ac_status" >&5 32173 echo "$as_me:32173: \$? = $ac_status" >&5
32101 if (exit $ac_status) && test -s out/conftest2.$ac_objext 32174 if (exit $ac_status) && test -s out/conftest2.$ac_objext
32102 then 32175 then
32103 # The compiler can only warn and ignore the option if not recognized 32176 # The compiler can only warn and ignore the option if not recognized
@@ -34188,7 +34261,7 @@ if test "$enable_stop_on_warning" = yes; then
34188 CXXFLAGS="$CXXFLAGS -Werror -O0" 34261 CXXFLAGS="$CXXFLAGS -Werror -O0"
34189fi 34262fi
34190 34263
34191ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" 34264ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
34192 34265
34193 34266
34194# Detection of the module for the future version of Scilab 6 34267# Detection of the module for the future version of Scilab 6
@@ -35566,6 +35639,7 @@ do
35566 "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;; 35639 "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;;
35567 "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;; 35640 "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;;
35568 "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;; 35641 "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;;
35642 "modules/xcos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xcos/Makefile" ;;
35569 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;; 35643 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;;
35570 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; 35644 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
35571 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; 35645 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
@@ -37575,6 +37649,7 @@ echo " Gluegen ............. = $GLUEGEN_RT"
37575echo " Jrosetta (API) ...... = $JROSETTA_API" 37649echo " Jrosetta (API) ...... = $JROSETTA_API"
37576echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 37650echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
37577echo " Commons Logging ..... = $COMMONS_LOGGING" 37651echo " Commons Logging ..... = $COMMONS_LOGGING"
37652echo " JGraph X ............ = $JGRAPHX"
37578fi 37653fi
37579 37654
37580echo "" 37655echo ""
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 3d1f186..86be6b0 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -130,11 +130,9 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
131 $(top_builddir)/modules/console/libsciconsole.la \ 131 $(top_builddir)/modules/console/libsciconsole.la \
132 $(top_builddir)/modules/jvm/libscijvm.la \ 132 $(top_builddir)/modules/jvm/libscijvm.la \
133<<<<<<< HEAD:scilab/modules/Makefile.am 133 $(top_builddir)/modules/xcos/libscixcos.la \
134 $(top_builddir)/modules/xcos/libscixcos.la
135=======
136 $(top_builddir)/modules/xpad/libscixpad.la 134 $(top_builddir)/modules/xpad/libscixpad.la
137>>>>>>> origin/master:scilab/modules/Makefile.am 135
138 136
139NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 137NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
140 $(top_builddir)/modules/renderer/libscirenderer-disable.la \ 138 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
@@ -142,11 +140,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
142 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 140 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
143 $(top_builddir)/modules/console/libsciconsole-disable.la \ 141 $(top_builddir)/modules/console/libsciconsole-disable.la \
144 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 142 $(top_builddir)/modules/jvm/libscijvm-disable.la \
145<<<<<<< HEAD:scilab/modules/Makefile.am 143 $(top_builddir)/modules/xcos/libscixcos-disable.la \
146 $(top_builddir)/modules/xcos/libscixcos-disable.la
147=======
148 $(top_builddir)/modules/xpad/libscixpad-disable.la 144 $(top_builddir)/modules/xpad/libscixpad-disable.la
149>>>>>>> origin/master:scilab/modules/Makefile.am
150 145
151ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 146ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
152 $(top_builddir)/modules/mexlib/libmex.la \ 147 $(top_builddir)/modules/mexlib/libmex.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 5abf174..1441123 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -161,7 +161,7 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \
161 sparse windows_tools functions overloading maple2scilab m2sci \ 161 sparse windows_tools functions overloading maple2scilab m2sci \
162 texmacs scipad development_tools compatibility_functions \ 162 texmacs scipad development_tools compatibility_functions \
163 helptools fftw umfpack demo_tools genetic_algorithms \ 163 helptools fftw umfpack demo_tools genetic_algorithms \
164 simulated_annealing parameters matio atoms hdf5 xpad \ 164 simulated_annealing parameters matio atoms hdf5 xcos xpad \
165 scicos_blocks scicos . javasci 165 scicos_blocks scicos . javasci
166DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 166DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
167am__relativize = \ 167am__relativize = \
@@ -264,6 +264,7 @@ JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
264JAVA_JNI_LIBS = @JAVA_JNI_LIBS@ 264JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
265JDB = @JDB@ 265JDB = @JDB@
266JEUCLID_CORE = @JEUCLID_CORE@ 266JEUCLID_CORE = @JEUCLID_CORE@
267JGRAPHX = @JGRAPHX@
267JHALL = @JHALL@ 268JHALL = @JHALL@
268JHDF5 = @JHDF5@ 269JHDF5 = @JHDF5@
269JOGL = @JOGL@ 270JOGL = @JOGL@
@@ -434,7 +435,7 @@ SUBDIRS = core output_stream action_binding arnoldi \
434 functions overloading maple2scilab m2sci texmacs scipad \ 435 functions overloading maple2scilab m2sci texmacs scipad \
435 development_tools compatibility_functions helptools fftw \ 436 development_tools compatibility_functions helptools fftw \
436 umfpack demo_tools genetic_algorithms simulated_annealing \ 437 umfpack demo_tools genetic_algorithms simulated_annealing \
437 parameters matio atoms hdf5 xpad $(am__append_1) scicos . \ 438 parameters matio atoms hdf5 xcos xpad $(am__append_1) scicos . \
438 $(am__append_2) 439 $(am__append_2)
439 440
440#### Basic files #### 441#### Basic files ####
@@ -458,6 +459,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
458 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 459 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
459 $(top_builddir)/modules/console/libsciconsole.la \ 460 $(top_builddir)/modules/console/libsciconsole.la \
460 $(top_builddir)/modules/jvm/libscijvm.la \ 461 $(top_builddir)/modules/jvm/libscijvm.la \
462 $(top_builddir)/modules/xcos/libscixcos.la \
461 $(top_builddir)/modules/xpad/libscixpad.la 463 $(top_builddir)/modules/xpad/libscixpad.la
462 464
463NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 465NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
@@ -466,6 +468,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
466 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 468 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
467 $(top_builddir)/modules/console/libsciconsole-disable.la \ 469 $(top_builddir)/modules/console/libsciconsole-disable.la \
468 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 470 $(top_builddir)/modules/jvm/libscijvm-disable.la \
471 $(top_builddir)/modules/xcos/libscixcos-disable.la \
469 $(top_builddir)/modules/xpad/libscixpad-disable.la 472 $(top_builddir)/modules/xpad/libscixpad-disable.la
470 473
471ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 474ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index 1323924..3f99cf9 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -1,8 +1,9 @@
1# Makefile.in generated by automake 1.10.2 from Makefile.am. 1# Makefile.in generated by automake 1.11 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6# Inc.
6# This Makefile.in is free software; the Free Software Foundation 7# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 8# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 9# with or without modifications, as long as this notice is preserved.
@@ -45,8 +46,9 @@
45 46
46VPATH = @srcdir@ 47VPATH = @srcdir@
47pkgdatadir = $(datadir)/@PACKAGE@ 48pkgdatadir = $(datadir)/@PACKAGE@
48pkglibdir = $(libdir)/@PACKAGE@
49pkgincludedir = $(includedir)/@PACKAGE@ 49pkgincludedir = $(includedir)/@PACKAGE@
50pkglibdir = $(libdir)/@PACKAGE@
51pkglibexecdir = $(libexecdir)/@PACKAGE@
50am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 52am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
51install_sh_DATA = $(install_sh) -c -m 644 53install_sh_DATA = $(install_sh) -c -m 644
52install_sh_PROGRAM = $(install_sh) -c 54install_sh_PROGRAM = $(install_sh) -c
@@ -71,31 +73,47 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
73 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 75 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \
74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libs_by_debian.m4 \ 76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
75 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \ 77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
76 $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ocaml.m4 \ 78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
77 $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \ 79 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
78 $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \ 80 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
79 $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \ 81 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
80 $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \ 82 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
81 $(top_srcdir)/configure.ac 83 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
84 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
82am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
83 $(ACLOCAL_M4) 86 $(ACLOCAL_M4)
84mkinstalldirs = $(install_sh) -d 87mkinstalldirs = $(install_sh) -d
85CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 88CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
86CONFIG_CLEAN_FILES = 89CONFIG_CLEAN_FILES =
90CONFIG_CLEAN_VPATH_FILES =
87am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 91am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
88am__vpath_adj = case $$p in \ 92am__vpath_adj = case $$p in \
89 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 93 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
90 *) f=$$p;; \ 94 *) f=$$p;; \
91 esac; 95 esac;
92am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 96am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
97am__install_max = 40
98am__nobase_strip_setup = \
99 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
100am__nobase_strip = \
101 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
102am__nobase_list = $(am__nobase_strip_setup); \
103 for p in $$list; do echo "$$p $$p"; done | \
104 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
105 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
106 if (++n[$$2] == $(am__install_max)) \
107 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
108 END { for (dir in files) print dir, files[dir] }'
109am__base_list = \
110 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
111 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
93am__installdirs = "$(DESTDIR)$(pkglibdir)" \ 112am__installdirs = "$(DESTDIR)$(pkglibdir)" \
94 "$(DESTDIR)$(libscixcos_la_etcdir)" \ 113 "$(DESTDIR)$(libscixcos_la_etcdir)" \
95 "$(DESTDIR)$(libscixcos_la_rootdir)" \ 114 "$(DESTDIR)$(libscixcos_la_rootdir)" \
96 "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)" \ 115 "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)" \
97 "$(DESTDIR)$(libscixcos_la_includedir)" 116 "$(DESTDIR)$(libscixcos_la_includedir)"
98pkglibLTLIBRARIES_INSTALL = $(INSTALL)
99LTLIBRARIES = $(pkglib_LTLIBRARIES) 117LTLIBRARIES = $(pkglib_LTLIBRARIES)
100libscixcos_disable_la_LIBADD = 118libscixcos_disable_la_LIBADD =
101am__objects_1 = libscixcos_disable_la-noxcos.lo 119am__objects_1 = libscixcos_disable_la-noxcos.lo
@@ -123,6 +141,7 @@ libscixcos_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
123DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 141DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
124depcomp = $(SHELL) $(top_srcdir)/config/depcomp 142depcomp = $(SHELL) $(top_srcdir)/config/depcomp
125am__depfiles_maybe = depfiles 143am__depfiles_maybe = depfiles
144am__mv = mv -f
126COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 145COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
127 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 146 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
128LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 147LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -144,12 +163,8 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
144SOURCES = $(libscixcos_disable_la_SOURCES) $(libscixcos_la_SOURCES) 163SOURCES = $(libscixcos_disable_la_SOURCES) $(libscixcos_la_SOURCES)
145DIST_SOURCES = $(libscixcos_disable_la_SOURCES) \ 164DIST_SOURCES = $(libscixcos_disable_la_SOURCES) \
146 $(libscixcos_la_SOURCES) 165 $(libscixcos_la_SOURCES)
147libscixcos_la_etcDATA_INSTALL = $(INSTALL_DATA)
148libscixcos_la_rootDATA_INSTALL = $(INSTALL_DATA)
149libscixcos_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
150DATA = $(libscixcos_la_etc_DATA) $(libscixcos_la_root_DATA) \ 166DATA = $(libscixcos_la_etc_DATA) $(libscixcos_la_root_DATA) \
151 $(libscixcos_la_sci_gateway_DATA) 167 $(libscixcos_la_sci_gateway_DATA)
152libscixcos_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
153HEADERS = $(libscixcos_la_include_HEADERS) 168HEADERS = $(libscixcos_la_include_HEADERS)
154ETAGS = etags 169ETAGS = etags
155CTAGS = ctags 170CTAGS = ctags
@@ -183,7 +198,7 @@ DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
183DEPDIR = @DEPDIR@ 198DEPDIR = @DEPDIR@
184DOCBOOK_ROOT = @DOCBOOK_ROOT@ 199DOCBOOK_ROOT = @DOCBOOK_ROOT@
185DSYMUTIL = @DSYMUTIL@ 200DSYMUTIL = @DSYMUTIL@
186ECHO = @ECHO@ 201DUMPBIN = @DUMPBIN@
187ECHO_C = @ECHO_C@ 202ECHO_C = @ECHO_C@
188ECHO_N = @ECHO_N@ 203ECHO_N = @ECHO_N@
189ECHO_T = @ECHO_T@ 204ECHO_T = @ECHO_T@
@@ -193,6 +208,7 @@ F77 = @F77@
193FFLAGS = @FFLAGS@ 208FFLAGS = @FFLAGS@
194FFTW3_LIB = @FFTW3_LIB@ 209FFTW3_LIB = @FFTW3_LIB@
195FFTW_ENABLE = @FFTW_ENABLE@ 210FFTW_ENABLE = @FFTW_ENABLE@
211FGREP = @FGREP@
196FLEXDOCK = @FLEXDOCK@ 212FLEXDOCK = @FLEXDOCK@
197FLIBS = @FLIBS@ 213FLIBS = @FLIBS@
198FOP = @FOP@ 214FOP = @FOP@
@@ -235,12 +251,14 @@ JOGL = @JOGL@
235JROSETTA_API = @JROSETTA_API@ 251JROSETTA_API = @JROSETTA_API@
236JROSETTA_ENGINE = @JROSETTA_ENGINE@ 252JROSETTA_ENGINE = @JROSETTA_ENGINE@
237LAPACK_LIBS = @LAPACK_LIBS@ 253LAPACK_LIBS = @LAPACK_LIBS@
254LD = @LD@
238LDFLAGS = @LDFLAGS@ 255LDFLAGS = @LDFLAGS@
239LIBICONV = @LIBICONV@ 256LIBICONV = @LIBICONV@
240LIBINTL = @LIBINTL@ 257LIBINTL = @LIBINTL@
241LIBOBJS = @LIBOBJS@ 258LIBOBJS = @LIBOBJS@
242LIBS = @LIBS@ 259LIBS = @LIBS@
243LIBTOOL = @LIBTOOL@ 260LIBTOOL = @LIBTOOL@
261LIPO = @LIPO@
244LN_S = @LN_S@ 262LN_S = @LN_S@
245LOOKS = @LOOKS@ 263LOOKS = @LOOKS@
246LTLIBICONV = @LTLIBICONV@ 264LTLIBICONV = @LTLIBICONV@
@@ -258,17 +276,21 @@ MSGFMT_015 = @MSGFMT_015@
258MSGMERGE = @MSGMERGE@ 276MSGMERGE = @MSGMERGE@
259NM = @NM@ 277NM = @NM@
260NMEDIT = @NMEDIT@ 278NMEDIT = @NMEDIT@
279OBJDUMP = @OBJDUMP@
261OBJEXT = @OBJEXT@ 280OBJEXT = @OBJEXT@
262OCAMLC = @OCAMLC@ 281OCAMLC = @OCAMLC@
263OCAMLDEP = @OCAMLDEP@ 282OCAMLDEP = @OCAMLDEP@
264OCAMLLEX = @OCAMLLEX@ 283OCAMLLEX = @OCAMLLEX@
265OCAMLOPT = @OCAMLOPT@ 284OCAMLOPT = @OCAMLOPT@
266OCAMLYACC = @OCAMLYACC@ 285OCAMLYACC = @OCAMLYACC@
286OTOOL = @OTOOL@
287OTOOL64 = @OTOOL64@
267PACKAGE = @PACKAGE@ 288PACKAGE = @PACKAGE@
268PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 289PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
269PACKAGE_NAME = @PACKAGE_NAME@ 290PACKAGE_NAME = @PACKAGE_NAME@
270PACKAGE_STRING = @PACKAGE_STRING@ 291PACKAGE_STRING = @PACKAGE_STRING@
271PACKAGE_TARNAME = @PACKAGE_TARNAME@ 292PACKAGE_TARNAME = @PACKAGE_TARNAME@
293PACKAGE_URL = @PACKAGE_URL@
272PACKAGE_VERSION = @PACKAGE_VERSION@ 294PACKAGE_VERSION = @PACKAGE_VERSION@
273PATH_SEPARATOR = @PATH_SEPARATOR@ 295PATH_SEPARATOR = @PATH_SEPARATOR@
274PCRE_CFLAGS = @PCRE_CFLAGS@ 296PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -329,6 +351,7 @@ abs_top_builddir = @abs_top_builddir@
329abs_top_srcdir = @abs_top_srcdir@ 351abs_top_srcdir = @abs_top_srcdir@
330ac_ct_CC = @ac_ct_CC@ 352ac_ct_CC = @ac_ct_CC@
331ac_ct_CXX = @ac_ct_CXX@ 353ac_ct_CXX = @ac_ct_CXX@
354ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
332ac_ct_F77 = @ac_ct_F77@ 355ac_ct_F77 = @ac_ct_F77@
333am__include = @am__include@ 356am__include = @am__include@
334am__leading_dot = @am__leading_dot@ 357am__leading_dot = @am__leading_dot@
@@ -361,6 +384,7 @@ libdir = @libdir@
361libexecdir = @libexecdir@ 384libexecdir = @libexecdir@
362localedir = @localedir@ 385localedir = @localedir@
363localstatedir = @localstatedir@ 386localstatedir = @localstatedir@
387lt_ECHO = @lt_ECHO@
364mandir = @mandir@ 388mandir = @mandir@
365mkdir_p = @mkdir_p@ 389mkdir_p = @mkdir_p@
366oldincludedir = @oldincludedir@ 390oldincludedir = @oldincludedir@
@@ -523,9 +547,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
523 exit 1;; \ 547 exit 1;; \
524 esac; \ 548 esac; \
525 done; \ 549 done; \
526 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/xcos/Makefile'; \ 550 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/xcos/Makefile'; \
527 cd $(top_srcdir) && \ 551 $(am__cd) $(top_srcdir) && \
528 $(AUTOMAKE) --foreign modules/xcos/Makefile 552 $(AUTOMAKE) --foreign modules/xcos/Makefile
529.PRECIOUS: Makefile 553.PRECIOUS: Makefile
530Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 554Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
531 @case '$?' in \ 555 @case '$?' in \
@@ -543,23 +567,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
543 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 567 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
544$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 568$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
545 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 569 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
570$(am__aclocal_m4_deps):
546install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) 571install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
547 @$(NORMAL_INSTALL) 572 @$(NORMAL_INSTALL)
548 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" 573 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
549 @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ 574 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
575 list2=; for p in $$list; do \
550 if test -f $$p; then \ 576 if test -f $$p; then \
551 f=$(am__strip_dir) \ 577 list2="$$list2 $$p"; \
552 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
553 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
554 else :; fi; \ 578 else :; fi; \
555 done 579 done; \
580 test -z "$$list2" || { \
581 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
582 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
583 }
556 584
557uninstall-pkglibLTLIBRARIES: 585uninstall-pkglibLTLIBRARIES:
558 @$(NORMAL_UNINSTALL) 586 @$(NORMAL_UNINSTALL)
559 @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ 587 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
560 p=$(am__strip_dir) \ 588 for p in $$list; do \
561 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ 589 $(am__strip_dir) \
562 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ 590 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
591 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
563 done 592 done
564 593
565clean-pkglibLTLIBRARIES: 594clean-pkglibLTLIBRARIES:
@@ -589,80 +618,80 @@ distclean-compile:
589 618
590.c.o: 619.c.o:
591@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 620@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
592@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 621@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
593@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 622@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
594@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 623@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
595@am__fastdepCC_FALSE@ $(COMPILE) -c $< 624@am__fastdepCC_FALSE@ $(COMPILE) -c $<
596 625
597.c.obj: 626.c.obj:
598@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 627@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
599@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 628@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
600@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 629@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
601@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 630@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
602@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` 631@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
603 632
604.c.lo: 633.c.lo:
605@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 634@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
606@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 635@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
607@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 636@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
608@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 637@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
609@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< 638@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
610 639
611libscixcos_disable_la-noxcos.lo: src/noxcos/noxcos.c 640libscixcos_disable_la-noxcos.lo: src/noxcos/noxcos.c
612@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscixcos_disable_la_CFLAGS) $(CFLAGS) -MT libscixcos_disable_la-noxcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_disable_la-noxcos.Tpo -c -o libscixcos_disable_la-noxcos.lo `test -f 'src/noxcos/noxcos.c' || echo '$(srcdir)/'`src/noxcos/noxcos.c 641@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscixcos_disable_la_CFLAGS) $(CFLAGS) -MT libscixcos_disable_la-noxcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_disable_la-noxcos.Tpo -c -o libscixcos_disable_la-noxcos.lo `test -f 'src/noxcos/noxcos.c' || echo '$(srcdir)/'`src/noxcos/noxcos.c
613@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscixcos_disable_la-noxcos.Tpo $(DEPDIR)/libscixcos_disable_la-noxcos.Plo 642@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_disable_la-noxcos.Tpo $(DEPDIR)/libscixcos_disable_la-noxcos.Plo
614@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noxcos/noxcos.c' object='libscixcos_disable_la-noxcos.lo' libtool=yes @AMDEPBACKSLASH@ 643@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noxcos/noxcos.c' object='libscixcos_disable_la-noxcos.lo' libtool=yes @AMDEPBACKSLASH@
615@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 644@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
616@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscixcos_disable_la_CFLAGS) $(CFLAGS) -c -o libscixcos_disable_la-noxcos.lo `test -f 'src/noxcos/noxcos.c' || echo '$(srcdir)/'`src/noxcos/noxcos.c 645@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscixcos_disable_la_CFLAGS) $(CFLAGS) -c -o libscixcos_disable_la-noxcos.lo `test -f 'src/noxcos/noxcos.c' || echo '$(srcdir)/'`src/noxcos/noxcos.c
617 646
618libscixcos_la-gw_xcos.lo: sci_gateway/c/gw_xcos.c 647libscixcos_la-gw_xcos.lo: sci_gateway/c/gw_xcos.c
619@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(libscixcos_la_CFLAGS) $(CFLAGS) -MT libscixcos_la-gw_xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-gw_xcos.Tpo -c -o libscixcos_la-gw_xcos.lo `test -f 'sci_gateway/c/gw_xcos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_xcos.c 648@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(libscixcos_la_CFLAGS) $(CFLAGS) -MT libscixcos_la-gw_xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-gw_xcos.Tpo -c -o libscixcos_la-gw_xcos.lo `test -f 'sci_gateway/c/gw_xcos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_xcos.c
620@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscixcos_la-gw_xcos.Tpo $(DEPDIR)/libscixcos_la-gw_xcos.Plo 649@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-gw_xcos.Tpo $(DEPDIR)/libscixcos_la-gw_xcos.Plo
621@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sci_gateway/c/gw_xcos.c' object='libscixcos_la-gw_xcos.lo' libtool=yes @AMDEPBACKSLASH@ 650@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sci_gateway/c/gw_xcos.c' object='libscixcos_la-gw_xcos.lo' libtool=yes @AMDEPBACKSLASH@
622@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 651@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
623@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(libscixcos_la_CFLAGS) $(CFLAGS) -c -o libscixcos_la-gw_xcos.lo `test -f 'sci_gateway/c/gw_xcos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_xcos.c 652@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(libscixcos_la_CFLAGS) $(CFLAGS) -c -o libscixcos_la-gw_xcos.lo `test -f 'sci_gateway/c/gw_xcos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_xcos.c
624 653
625.cpp.o: 654.cpp.o:
626@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 655@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
627@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 656@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
628@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 657@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
629@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 658@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
630@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< 659@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
631 660
632.cpp.obj: 661.cpp.obj:
633@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 662@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
634@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 663@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
635@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 664@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
636@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 665@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
637@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` 666@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
638 667
639.cpp.lo: 668.cpp.lo:
640@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 669@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
641@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 670@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
642@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 671@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
643@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 672@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
644@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< 673@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
645 674
646libscixcos_la-sci_Xcos.lo: sci_gateway/cpp/sci_Xcos.cpp 675libscixcos_la-sci_Xcos.lo: sci_gateway/cpp/sci_Xcos.cpp
647@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-sci_Xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-sci_Xcos.Tpo -c -o libscixcos_la-sci_Xcos.lo `test -f 'sci_gateway/cpp/sci_Xcos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_Xcos.cpp 676@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-sci_Xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-sci_Xcos.Tpo -c -o libscixcos_la-sci_Xcos.lo `test -f 'sci_gateway/cpp/sci_Xcos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_Xcos.cpp
648@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscixcos_la-sci_Xcos.Tpo $(DEPDIR)/libscixcos_la-sci_Xcos.Plo 677@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-sci_Xcos.Tpo $(DEPDIR)/libscixcos_la-sci_Xcos.Plo
649@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_Xcos.cpp' object='libscixcos_la-sci_Xcos.lo' libtool=yes @AMDEPBACKSLASH@ 678@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_Xcos.cpp' object='libscixcos_la-sci_Xcos.lo' libtool=yes @AMDEPBACKSLASH@
650@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 679@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
651@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-sci_Xcos.lo `test -f 'sci_gateway/cpp/sci_Xcos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_Xcos.cpp 680@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-sci_Xcos.lo `test -f 'sci_gateway/cpp/sci_Xcos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_Xcos.cpp
652 681
653libscixcos_la-callxcos.lo: src/cpp/callxcos.cpp 682libscixcos_la-callxcos.lo: src/cpp/callxcos.cpp
654@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-callxcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-callxcos.Tpo -c -o libscixcos_la-callxcos.lo `test -f 'src/cpp/callxcos.cpp' || echo '$(srcdir)/'`src/cpp/callxcos.cpp 683@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-callxcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-callxcos.Tpo -c -o libscixcos_la-callxcos.lo `test -f 'src/cpp/callxcos.cpp' || echo '$(srcdir)/'`src/cpp/callxcos.cpp
655@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscixcos_la-callxcos.Tpo $(DEPDIR)/libscixcos_la-callxcos.Plo 684@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-callxcos.Tpo $(DEPDIR)/libscixcos_la-callxcos.Plo
656@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/cpp/callxcos.cpp' object='libscixcos_la-callxcos.lo' libtool=yes @AMDEPBACKSLASH@ 685@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/cpp/callxcos.cpp' object='libscixcos_la-callxcos.lo' libtool=yes @AMDEPBACKSLASH@
657@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 686@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
658@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-callxcos.lo `test -f 'src/cpp/callxcos.cpp' || echo '$(srcdir)/'`src/cpp/callxcos.cpp 687@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-callxcos.lo `test -f 'src/cpp/callxcos.cpp' || echo '$(srcdir)/'`src/cpp/callxcos.cpp
659 688
660libscixcos_la-Xcos.lo: src/jni/Xcos.cpp 689libscixcos_la-Xcos.lo: src/jni/Xcos.cpp
661@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-Xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-Xcos.Tpo -c -o libscixcos_la-Xcos.lo `test -f 'src/jni/Xcos.cpp' || echo '$(srcdir)/'`src/jni/Xcos.cpp 690@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-Xcos.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-Xcos.Tpo -c -o libscixcos_la-Xcos.lo `test -f 'src/jni/Xcos.cpp' || echo '$(srcdir)/'`src/jni/Xcos.cpp
662@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libscixcos_la-Xcos.Tpo $(DEPDIR)/libscixcos_la-Xcos.Plo 691@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-Xcos.Tpo $(DEPDIR)/libscixcos_la-Xcos.Plo
663@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/jni/Xcos.cpp' object='libscixcos_la-Xcos.lo' libtool=yes @AMDEPBACKSLASH@ 692@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/jni/Xcos.cpp' object='libscixcos_la-Xcos.lo' libtool=yes @AMDEPBACKSLASH@
664@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 693@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
665@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-Xcos.lo `test -f 'src/jni/Xcos.cpp' || echo '$(srcdir)/'`src/jni/Xcos.cpp 694@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-Xcos.lo `test -f 'src/jni/Xcos.cpp' || echo '$(srcdir)/'`src/jni/Xcos.cpp
666 695
667mostlyclean-libtool: 696mostlyclean-libtool:
668 -rm -f *.lo 697 -rm -f *.lo
@@ -672,71 +701,83 @@ clean-libtool:
672install-libscixcos_la_etcDATA: $(libscixcos_la_etc_DATA) 701install-libscixcos_la_etcDATA: $(libscixcos_la_etc_DATA)
673 @$(NORMAL_INSTALL) 702 @$(NORMAL_INSTALL)
674 test -z "$(libscixcos_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_etcdir)" 703 test -z "$(libscixcos_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_etcdir)"
675 @list='$(libscixcos_la_etc_DATA)'; for p in $$list; do \ 704 @list='$(libscixcos_la_etc_DATA)'; test -n "$(libscixcos_la_etcdir)" || list=; \
705 for p in $$list; do \
676 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 706 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
677 f=$(am__strip_dir) \ 707 echo "$$d$$p"; \
678 echo " $(libscixcos_la_etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscixcos_la_etcdir)/$$f'"; \ 708 done | $(am__base_list) | \
679 $(libscixcos_la_etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscixcos_la_etcdir)/$$f"; \ 709 while read files; do \
710 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscixcos_la_etcdir)'"; \
711 $(INSTALL_DATA) $$files "$(DESTDIR)$(libscixcos_la_etcdir)" || exit $$?; \
680 done 712 done
681 713
682uninstall-libscixcos_la_etcDATA: 714uninstall-libscixcos_la_etcDATA:
683 @$(NORMAL_UNINSTALL) 715 @$(NORMAL_UNINSTALL)
684 @list='$(libscixcos_la_etc_DATA)'; for p in $$list; do \ 716 @list='$(libscixcos_la_etc_DATA)'; test -n "$(libscixcos_la_etcdir)" || list=; \
685 f=$(am__strip_dir) \ 717 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
686 echo " rm -f '$(DESTDIR)$(libscixcos_la_etcdir)/$$f'"; \ 718 test -n "$$files" || exit 0; \
687 rm -f "$(DESTDIR)$(libscixcos_la_etcdir)/$$f"; \ 719 echo " ( cd '$(DESTDIR)$(libscixcos_la_etcdir)' && rm -f" $$files ")"; \
688 done 720 cd "$(DESTDIR)$(libscixcos_la_etcdir)" && rm -f $$files
689install-libscixcos_la_rootDATA: $(libscixcos_la_root_DATA) 721install-libscixcos_la_rootDATA: $(libscixcos_la_root_DATA)
690 @$(NORMAL_INSTALL) 722 @$(NORMAL_INSTALL)
691 test -z "$(libscixcos_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_rootdir)" 723 test -z "$(libscixcos_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_rootdir)"
692 @list='$(libscixcos_la_root_DATA)'; for p in $$list; do \ 724 @list='$(libscixcos_la_root_DATA)'; test -n "$(libscixcos_la_rootdir)" || list=; \
725 for p in $$list; do \
693 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 726 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
694 f=$(am__strip_dir) \ 727 echo "$$d$$p"; \
695 echo " $(libscixcos_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscixcos_la_rootdir)/$$f'"; \ 728 done | $(am__base_list) | \
696 $(libscixcos_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscixcos_la_rootdir)/$$f"; \ 729 while read files; do \
730 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscixcos_la_rootdir)'"; \
731 $(INSTALL_DATA) $$files "$(DESTDIR)$(libscixcos_la_rootdir)" || exit $$?; \
697 done 732 done
698 733
699uninstall-libscixcos_la_rootDATA: 734uninstall-libscixcos_la_rootDATA:
700 @$(NORMAL_UNINSTALL) 735 @$(NORMAL_UNINSTALL)
701 @list='$(libscixcos_la_root_DATA)'; for p in $$list; do \ 736 @list='$(libscixcos_la_root_DATA)'; test -n "$(libscixcos_la_rootdir)" || list=; \
702 f=$(am__strip_dir) \ 737 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
703 echo " rm -f '$(DESTDIR)$(libscixcos_la_rootdir)/$$f'"; \ 738 test -n "$$files" || exit 0; \
704 rm -f "$(DESTDIR)$(libscixcos_la_rootdir)/$$f"; \ 739 echo " ( cd '$(DESTDIR)$(libscixcos_la_rootdir)' && rm -f" $$files ")"; \
705 done 740 cd "$(DESTDIR)$(libscixcos_la_rootdir)" && rm -f $$files
706install-libscixcos_la_sci_gatewayDATA: $(libscixcos_la_sci_gateway_DATA) 741install-libscixcos_la_sci_gatewayDATA: $(libscixcos_la_sci_gateway_DATA)
707 @$(NORMAL_INSTALL) 742 @$(NORMAL_INSTALL)
708 test -z "$(libscixcos_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)" 743 test -z "$(libscixcos_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)"
709 @list='$(libscixcos_la_sci_gateway_DATA)'; for p in $$list; do \ 744 @list='$(libscixcos_la_sci_gateway_DATA)'; test -n "$(libscixcos_la_sci_gatewaydir)" || list=; \
745 for p in $$list; do \
710 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 746 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
711 f=$(am__strip_dir) \ 747 echo "$$d$$p"; \
712 echo " $(libscixcos_la_sci_gatewayDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscixcos_la_sci_gatewaydir)/$$f'"; \ 748 done | $(am__base_list) | \
713 $(libscixcos_la_sci_gatewayDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)/$$f"; \ 749 while read files; do \
750 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscixcos_la_sci_gatewaydir)'"; \
751 $(INSTALL_DATA) $$files "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)" || exit $$?; \
714 done 752 done
715 753
716uninstall-libscixcos_la_sci_gatewayDATA: 754uninstall-libscixcos_la_sci_gatewayDATA:
717 @$(NORMAL_UNINSTALL) 755 @$(NORMAL_UNINSTALL)
718 @list='$(libscixcos_la_sci_gateway_DATA)'; for p in $$list; do \ 756 @list='$(libscixcos_la_sci_gateway_DATA)'; test -n "$(libscixcos_la_sci_gatewaydir)" || list=; \
719 f=$(am__strip_dir) \ 757 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
720 echo " rm -f '$(DESTDIR)$(libscixcos_la_sci_gatewaydir)/$$f'"; \ 758 test -n "$$files" || exit 0; \
721 rm -f "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)/$$f"; \ 759 echo " ( cd '$(DESTDIR)$(libscixcos_la_sci_gatewaydir)' && rm -f" $$files ")"; \
722 done 760 cd "$(DESTDIR)$(libscixcos_la_sci_gatewaydir)" && rm -f $$files
723install-libscixcos_la_includeHEADERS: $(libscixcos_la_include_HEADERS) 761install-libscixcos_la_includeHEADERS: $(libscixcos_la_include_HEADERS)
724 @$(NORMAL_INSTALL) 762 @$(NORMAL_INSTALL)
725 test -z "$(libscixcos_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_includedir)" 763 test -z "$(libscixcos_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscixcos_la_includedir)"
726 @list='$(libscixcos_la_include_HEADERS)'; for p in $$list; do \ 764 @list='$(libscixcos_la_include_HEADERS)'; test -n "$(libscixcos_la_includedir)" || list=; \
765 for p in $$list; do \
727 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 766 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
728 f=$(am__strip_dir) \ 767 echo "$$d$$p"; \
729 echo " $(libscixcos_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libscixcos_la_includedir)/$$f'"; \ 768 done | $(am__base_list) | \
730 $(libscixcos_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libscixcos_la_includedir)/$$f"; \ 769 while read files; do \
770 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscixcos_la_includedir)'"; \
771 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscixcos_la_includedir)" || exit $$?; \
731 done 772 done
732 773
733uninstall-libscixcos_la_includeHEADERS: 774uninstall-libscixcos_la_includeHEADERS:
734 @$(NORMAL_UNINSTALL) 775 @$(NORMAL_UNINSTALL)
735 @list='$(libscixcos_la_include_HEADERS)'; for p in $$list; do \ 776 @list='$(libscixcos_la_include_HEADERS)'; test -n "$(libscixcos_la_includedir)" || list=; \
736 f=$(am__strip_dir) \ 777 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
737 echo " rm -f '$(DESTDIR)$(libscixcos_la_includedir)/$$f'"; \ 778 test -n "$$files" || exit 0; \
738 rm -f "$(DESTDIR)$(libscixcos_la_includedir)/$$f"; \ 779 echo " ( cd '$(DESTDIR)$(libscixcos_la_includedir)' && rm -f" $$files ")"; \
739 done 780 cd "$(DESTDIR)$(libscixcos_la_includedir)" && rm -f $$files
740 781
741ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 782ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
742 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 783 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -750,7 +791,7 @@ tags: TAGS
750 791
751TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 792TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
752 $(TAGS_FILES) $(LISP) 793 $(TAGS_FILES) $(LISP)
753 tags=; \ 794 set x; \
754 here=`pwd`; \ 795 here=`pwd`; \
755 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 796 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
756 unique=`for i in $$list; do \ 797 unique=`for i in $$list; do \
@@ -758,29 +799,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
758 done | \ 799 done | \
759 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 800 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
760 END { if (nonempty) { for (i in files) print i; }; }'`; \ 801 END { if (nonempty) { for (i in files) print i; }; }'`; \
761 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 802 shift; \
803 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
762 test -n "$$unique" || unique=$$empty_fix; \ 804 test -n "$$unique" || unique=$$empty_fix; \
763 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 805 if test $$# -gt 0; then \
764 $$tags $$unique; \ 806 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
807 "$$@" $$unique; \
808 else \
809 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
810 $$unique; \
811 fi; \
765 fi 812 fi
766ctags: CTAGS 813ctags: CTAGS
767CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ 814CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
768 $(TAGS_FILES) $(LISP) 815 $(TAGS_FILES) $(LISP)
769 tags=; \
770 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 816 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
771 unique=`for i in $$list; do \ 817 unique=`for i in $$list; do \
772 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 818 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
773 done | \ 819 done | \
774 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 820 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
775 END { if (nonempty) { for (i in files) print i; }; }'`; \ 821 END { if (nonempty) { for (i in files) print i; }; }'`; \
776 test -z "$(CTAGS_ARGS)$$tags$$unique" \ 822 test -z "$(CTAGS_ARGS)$$unique" \
777 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ 823 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
778 $$tags $$unique 824 $$unique
779 825
780GTAGS: 826GTAGS:
781 here=`$(am__cd) $(top_builddir) && pwd` \ 827 here=`$(am__cd) $(top_builddir) && pwd` \
782 && cd $(top_srcdir) \ 828 && $(am__cd) $(top_srcdir) \
783 && gtags -i $(GTAGS_ARGS) $$here 829 && gtags -i $(GTAGS_ARGS) "$$here"
784 830
785distclean-tags: 831distclean-tags:
786 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 832 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -801,13 +847,17 @@ distdir: $(DISTFILES)
801 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 847 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
802 if test -d $$d/$$file; then \ 848 if test -d $$d/$$file; then \
803 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 849 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
850 if test -d "$(distdir)/$$file"; then \
851 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
852 fi; \
804 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 853 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
805 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 854 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
855 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
806 fi; \ 856 fi; \
807 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ 857 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
808 else \ 858 else \
809 test -f $(distdir)/$$file \ 859 test -f "$(distdir)/$$file" \
810 || cp -p $$d/$$file $(distdir)/$$file \ 860 || cp -p $$d/$$file "$(distdir)/$$file" \
811 || exit 1; \ 861 || exit 1; \
812 fi; \ 862 fi; \
813 done 863 done
@@ -841,6 +891,7 @@ clean-generic:
841 891
842distclean-generic: 892distclean-generic:
843 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) 893 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
894 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
844 895
845maintainer-clean-generic: 896maintainer-clean-generic:
846 @echo "This command is intended for maintainers to use" 897 @echo "This command is intended for maintainers to use"
@@ -863,6 +914,8 @@ dvi-am:
863 914
864html: html-am 915html: html-am
865 916
917html-am:
918
866info: info-am 919info: info-am
867 920
868info-am: 921info-am:
@@ -874,6 +927,8 @@ install-data-am: install-data-local install-libscixcos_la_etcDATA \
874 927
875install-dvi: install-dvi-am 928install-dvi: install-dvi-am
876 929
930install-dvi-am:
931
877install-exec-am: install-pkglibLTLIBRARIES 932install-exec-am: install-pkglibLTLIBRARIES
878 933
879install-html: install-html-am 934install-html: install-html-am
@@ -882,12 +937,18 @@ install-html-am: install-html-local
882 937
883install-info: install-info-am 938install-info: install-info-am
884 939
940install-info-am:
941
885install-man: 942install-man:
886 943
887install-pdf: install-pdf-am 944install-pdf: install-pdf-am
888 945
946install-pdf-am:
947
889install-ps: install-ps-am 948install-ps: install-ps-am
890 949
950install-ps-am:
951
891installcheck-am: 952installcheck-am:
892 953
893maintainer-clean: maintainer-clean-am 954maintainer-clean: maintainer-clean-am
@@ -914,7 +975,7 @@ uninstall-am: uninstall-libscixcos_la_etcDATA \
914 uninstall-libscixcos_la_sci_gatewayDATA \ 975 uninstall-libscixcos_la_sci_gatewayDATA \
915 uninstall-pkglibLTLIBRARIES 976 uninstall-pkglibLTLIBRARIES
916 977
917.MAKE: install-am install-strip 978.MAKE: all check check-am install install-am install-strip
918 979
919.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ 980.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
920 clean clean-generic clean-libtool clean-local \ 981 clean clean-generic clean-libtool clean-local \
@@ -1120,6 +1181,7 @@ distclean-local:
1120 rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_* 1181 rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
1121 1182
1122.PHONY: macros java swig giws 1183.PHONY: macros java swig giws
1184
1123# Tell versions [3.59,3.63) of GNU make to not export all variables. 1185# Tell versions [3.59,3.63) of GNU make to not export all variables.
1124# Otherwise a system limit (for SysV at least) may be exceeded. 1186# Otherwise a system limit (for SysV at least) may be exceeded.
1125.NOEXPORT: 1187.NOEXPORT:
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index 42b1be7..0413daa 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -245,6 +245,7 @@ JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
245JAVA_JNI_LIBS = @JAVA_JNI_LIBS@ 245JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
246JDB = @JDB@ 246JDB = @JDB@
247JEUCLID_CORE = @JEUCLID_CORE@ 247JEUCLID_CORE = @JEUCLID_CORE@
248JGRAPHX = @JGRAPHX@
248JHALL = @JHALL@ 249JHALL = @JHALL@
249JHDF5 = @JHDF5@ 250JHDF5 = @JHDF5@
250JOGL = @JOGL@ 251JOGL = @JOGL@