summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
commitf23b2110d698093a959634e19007c8d84d531c5e (patch)
tree9d2f52524635264289e90dcfaa4fa0c44eb147d2 /scilab/modules/intersci
parent6e0ed76a324ba57a846cf16750c297414d32428d (diff)
parent11ad7608e335c7505a00ee05fd2a3d67a5e6842e (diff)
downloadscilab-f23b2110d698093a959634e19007c8d84d531c5e.zip
scilab-f23b2110d698093a959634e19007c8d84d531c5e.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.am2
-rw-r--r--scilab/modules/intersci/Makefile.in16
2 files changed, 10 insertions, 8 deletions
diff --git a/scilab/modules/intersci/Makefile.am b/scilab/modules/intersci/Makefile.am
index 337710b..8c6fdac 100644
--- a/scilab/modules/intersci/Makefile.am
+++ b/scilab/modules/intersci/Makefile.am
@@ -21,7 +21,7 @@ src/exe/declare.c \
21src/exe/opt.c \ 21src/exe/opt.c \
22src/exe/check.c 22src/exe/check.c
23 23
24libsciintersci_la_includedir=$(pkgincludedir)/intersci 24libsciintersci_la_includedir=$(pkgincludedir)
25 25
26pkglib_LTLIBRARIES = libsciintersci.la 26pkglib_LTLIBRARIES = libsciintersci.la
27 27
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 51b57b3..539dd2e 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -393,7 +393,7 @@ src/exe/declare.c \
393src/exe/opt.c \ 393src/exe/opt.c \
394src/exe/check.c 394src/exe/check.c
395 395
396libsciintersci_la_includedir = $(pkgincludedir)/intersci 396libsciintersci_la_includedir = $(pkgincludedir)
397pkglib_LTLIBRARIES = libsciintersci.la 397pkglib_LTLIBRARIES = libsciintersci.la
398libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 398libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
399intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES) 399intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
@@ -1101,7 +1101,7 @@ check-code:
1101@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1101@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1102@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1102@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1103@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1103@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1104@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1104@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1105@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1105@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1106@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1106@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1107@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1107@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1113,7 +1113,7 @@ check-code:
1113 1113
1114@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1114@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1115@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1115@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1116@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1116@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1117@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1117@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1118@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1118@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1119@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1119@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1219,10 +1219,12 @@ install-data-local:
1219 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1219 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1220 if test -d $(srcdir)/$$dir/; then \ 1220 if test -d $(srcdir)/$$dir/; then \
1221 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1221 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1222 for specialExt in $(MACROSSPECIALEXT); do \ 1222 if test -n "$(MACROSSPECIALEXT)"; then \
1223 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1223 for specialExt in $(MACROSSPECIALEXT); do \
1224 done; \ 1224 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1225 FILELIST="$$FILELIST $$specialExtDir"; \ 1225 done; \
1226 FILELIST="$$FILELIST $$specialExtDir"; \
1227 fi; \
1226 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1228 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1227 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1229 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1228 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1230 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \