summaryrefslogtreecommitdiffstats
path: root/scilab/modules/metanet
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/metanet
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/metanet')
-rw-r--r--scilab/modules/metanet/Makefile.am2
-rw-r--r--scilab/modules/metanet/Makefile.in16
2 files changed, 10 insertions, 8 deletions
diff --git a/scilab/modules/metanet/Makefile.am b/scilab/modules/metanet/Makefile.am
index 0ad7ba6..307248b 100644
--- a/scilab/modules/metanet/Makefile.am
+++ b/scilab/modules/metanet/Makefile.am
@@ -152,7 +152,7 @@ libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
152libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml 152libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
153 153
154#### metanet : include files #### 154#### metanet : include files ####
155libscimetanet_la_includedir=$(pkgincludedir)/metanet 155libscimetanet_la_includedir=$(pkgincludedir)
156libscimetanet_la_include_HEADERS = includes/gw_metanet.h \ 156libscimetanet_la_include_HEADERS = includes/gw_metanet.h \
157includes/dynlib_metanet.h 157includes/dynlib_metanet.h
158 158
diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index 25fb3939..4b36606 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -554,7 +554,7 @@ libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
554libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml 554libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
555 555
556#### metanet : include files #### 556#### metanet : include files ####
557libscimetanet_la_includedir = $(pkgincludedir)/metanet 557libscimetanet_la_includedir = $(pkgincludedir)
558libscimetanet_la_include_HEADERS = includes/gw_metanet.h \ 558libscimetanet_la_include_HEADERS = includes/gw_metanet.h \
559includes/dynlib_metanet.h 559includes/dynlib_metanet.h
560 560
@@ -1436,7 +1436,7 @@ check-code:
1436@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1436@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1437@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1437@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1438@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1438@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1439@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1439@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1440@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1440@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1441@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1441@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1442@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1442@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1448,7 +1448,7 @@ check-code:
1448 1448
1449@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1449@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1450@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1450@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1451@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1451@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1452@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1452@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1453@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1453@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1454@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1454@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1554,10 +1554,12 @@ install-data-local:
1554 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1554 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1555 if test -d $(srcdir)/$$dir/; then \ 1555 if test -d $(srcdir)/$$dir/; then \
1556 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1556 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1557 for specialExt in $(MACROSSPECIALEXT); do \ 1557 if test -n "$(MACROSSPECIALEXT)"; then \
1558 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1558 for specialExt in $(MACROSSPECIALEXT); do \
1559 done; \ 1559 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1560 FILELIST="$$FILELIST $$specialExtDir"; \ 1560 done; \
1561 FILELIST="$$FILELIST $$specialExtDir"; \
1562 fi; \
1561 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1563 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1562 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1564 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1563 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1565 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \