summaryrefslogtreecommitdiffstats
path: root/scilab/modules/metanet
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-01 17:01:11 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-01 17:01:11 +0200
commit2fb4ff7896b16475eee5c91aa1f36d455edb81f1 (patch)
treea9493feb506117c88c49468ea56aaf3fbd50d581 /scilab/modules/metanet
parent918ab33f833c1830fd9d2a9714ae126481db9c31 (diff)
parent7734774190cf0720862b0b15c26fc2c875ea113a (diff)
downloadscilab-2fb4ff7896b16475eee5c91aa1f36d455edb81f1.zip
scilab-2fb4ff7896b16475eee5c91aa1f36d455edb81f1.tar.gz
Merge commit 'origin/master' into scilab-macosx
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/metanet')
-rw-r--r--scilab/modules/metanet/Makefile.am5
-rw-r--r--scilab/modules/metanet/Makefile.in51
-rw-r--r--scilab/modules/metanet/metanet.iss2
3 files changed, 12 insertions, 46 deletions
diff --git a/scilab/modules/metanet/Makefile.am b/scilab/modules/metanet/Makefile.am
index 307248b..0767880 100644
--- a/scilab/modules/metanet/Makefile.am
+++ b/scilab/modules/metanet/Makefile.am
@@ -151,11 +151,6 @@ libscimetanet_la_etc_DATA = etc/metanet.quit etc/metanet.start
151libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway 151libscimetanet_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 ####
155libscimetanet_la_includedir=$(pkgincludedir)
156libscimetanet_la_include_HEADERS = includes/gw_metanet.h \
157includes/dynlib_metanet.h
158
159#### metanet : Macros #### 154#### metanet : Macros ####
160MACROSDIRSEXT = macros/editor macros/graph_tools 155MACROSDIRSEXT = macros/editor macros/graph_tools
161 156
diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index 75203ac..c93c38f 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -37,7 +37,6 @@
37########## 37##########
38 38
39 39
40
41VPATH = @srcdir@ 40VPATH = @srcdir@
42pkgdatadir = $(datadir)/@PACKAGE@ 41pkgdatadir = $(datadir)/@PACKAGE@
43pkgincludedir = $(includedir)/@PACKAGE@ 42pkgincludedir = $(includedir)/@PACKAGE@
@@ -57,8 +56,7 @@ PRE_UNINSTALL = :
57POST_UNINSTALL = : 56POST_UNINSTALL = :
58build_triplet = @build@ 57build_triplet = @build@
59host_triplet = @host@ 58host_triplet = @host@
60DIST_COMMON = $(libscimetanet_la_include_HEADERS) \ 59DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_1 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/metanet 62subdir = modules/metanet
@@ -78,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
78 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac 76 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
79am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 77am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
80 $(ACLOCAL_M4) 78 $(ACLOCAL_M4)
81mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 79mkinstalldirs = $(install_sh) -d
82CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 80CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
83CONFIG_CLEAN_FILES = 81CONFIG_CLEAN_FILES =
84CONFIG_CLEAN_VPATH_FILES = 82CONFIG_CLEAN_VPATH_FILES =
@@ -106,8 +104,7 @@ am__base_list = \
106am__installdirs = "$(DESTDIR)$(pkglibdir)" \ 104am__installdirs = "$(DESTDIR)$(pkglibdir)" \
107 "$(DESTDIR)$(libscimetanet_la_etcdir)" \ 105 "$(DESTDIR)$(libscimetanet_la_etcdir)" \
108 "$(DESTDIR)$(libscimetanet_la_rootdir)" \ 106 "$(DESTDIR)$(libscimetanet_la_rootdir)" \
109 "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" \ 107 "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)"
110 "$(DESTDIR)$(libscimetanet_la_includedir)"
111LTLIBRARIES = $(pkglib_LTLIBRARIES) 108LTLIBRARIES = $(pkglib_LTLIBRARIES)
112libscimetanet_la_DEPENDENCIES = \ 109libscimetanet_la_DEPENDENCIES = \
113 $(top_builddir)/libs/hashtable/libscihashtable.la \ 110 $(top_builddir)/libs/hashtable/libscihashtable.la \
@@ -176,7 +173,6 @@ SOURCES = $(libscimetanet_la_SOURCES)
176DIST_SOURCES = $(libscimetanet_la_SOURCES) 173DIST_SOURCES = $(libscimetanet_la_SOURCES)
177DATA = $(libscimetanet_la_etc_DATA) $(libscimetanet_la_root_DATA) \ 174DATA = $(libscimetanet_la_etc_DATA) $(libscimetanet_la_root_DATA) \
178 $(libscimetanet_la_sci_gateway_DATA) 175 $(libscimetanet_la_sci_gateway_DATA)
179HEADERS = $(libscimetanet_la_include_HEADERS)
180ETAGS = etags 176ETAGS = etags
181CTAGS = ctags 177CTAGS = ctags
182DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 178DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -223,9 +219,11 @@ FGREP = @FGREP@
223FLEXDOCK = @FLEXDOCK@ 219FLEXDOCK = @FLEXDOCK@
224FLIBS = @FLIBS@ 220FLIBS = @FLIBS@
225FOP = @FOP@ 221FOP = @FOP@
222GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
226GIWS_BIN = @GIWS_BIN@ 223GIWS_BIN = @GIWS_BIN@
227GLUEGEN_RT = @GLUEGEN_RT@ 224GLUEGEN_RT = @GLUEGEN_RT@
228GMSGFMT = @GMSGFMT@ 225GMSGFMT = @GMSGFMT@
226GMSGFMT_015 = @GMSGFMT_015@
229GRAPHICS_ENABLE = @GRAPHICS_ENABLE@ 227GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
230GREP = @GREP@ 228GREP = @GREP@
231GUI_ENABLE = @GUI_ENABLE@ 229GUI_ENABLE = @GUI_ENABLE@
@@ -278,9 +276,9 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
278MATIO_ENABLE = @MATIO_ENABLE@ 276MATIO_ENABLE = @MATIO_ENABLE@
279MATIO_LIBS = @MATIO_LIBS@ 277MATIO_LIBS = @MATIO_LIBS@
280MKDIR_P = @MKDIR_P@ 278MKDIR_P = @MKDIR_P@
281MKINSTALLDIRS = @MKINSTALLDIRS@
282MSGCAT = @MSGCAT@ 279MSGCAT = @MSGCAT@
283MSGFMT = @MSGFMT@ 280MSGFMT = @MSGFMT@
281MSGFMT_015 = @MSGFMT_015@
284MSGMERGE = @MSGMERGE@ 282MSGMERGE = @MSGMERGE@
285NM = @NM@ 283NM = @NM@
286NMEDIT = @NMEDIT@ 284NMEDIT = @NMEDIT@
@@ -298,6 +296,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
298PACKAGE_NAME = @PACKAGE_NAME@ 296PACKAGE_NAME = @PACKAGE_NAME@
299PACKAGE_STRING = @PACKAGE_STRING@ 297PACKAGE_STRING = @PACKAGE_STRING@
300PACKAGE_TARNAME = @PACKAGE_TARNAME@ 298PACKAGE_TARNAME = @PACKAGE_TARNAME@
299PACKAGE_URL = @PACKAGE_URL@
301PACKAGE_VERSION = @PACKAGE_VERSION@ 300PACKAGE_VERSION = @PACKAGE_VERSION@
302PATH_SEPARATOR = @PATH_SEPARATOR@ 301PATH_SEPARATOR = @PATH_SEPARATOR@
303PCRE_CFLAGS = @PCRE_CFLAGS@ 302PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -339,6 +338,8 @@ VERSION = @VERSION@
339WITH_OCAML = @WITH_OCAML@ 338WITH_OCAML = @WITH_OCAML@
340WITH_TKSCI = @WITH_TKSCI@ 339WITH_TKSCI = @WITH_TKSCI@
341XGETTEXT = @XGETTEXT@ 340XGETTEXT = @XGETTEXT@
341XGETTEXT_015 = @XGETTEXT_015@
342XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
342XMKMF = @XMKMF@ 343XMKMF = @XMKMF@
343XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@ 344XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
344XML_APIS_EXT = @XML_APIS_EXT@ 345XML_APIS_EXT = @XML_APIS_EXT@
@@ -546,12 +547,6 @@ libscimetanet_la_etc_DATA = etc/metanet.quit etc/metanet.start
546libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway 547libscimetanet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
547libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml 548libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
548 549
549#### metanet : include files ####
550libscimetanet_la_includedir = $(pkgincludedir)
551libscimetanet_la_include_HEADERS = includes/gw_metanet.h \
552includes/dynlib_metanet.h
553
554
555#### metanet : Macros #### 550#### metanet : Macros ####
556MACROSDIRSEXT = macros/editor macros/graph_tools 551MACROSDIRSEXT = macros/editor macros/graph_tools
557 552
@@ -1156,26 +1151,6 @@ uninstall-libscimetanet_la_sci_gatewayDATA:
1156 test -n "$$files" || exit 0; \ 1151 test -n "$$files" || exit 0; \
1157 echo " ( cd '$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)' && rm -f" $$files ")"; \ 1152 echo " ( cd '$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)' && rm -f" $$files ")"; \
1158 cd "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" && rm -f $$files 1153 cd "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" && rm -f $$files
1159install-libscimetanet_la_includeHEADERS: $(libscimetanet_la_include_HEADERS)
1160 @$(NORMAL_INSTALL)
1161 test -z "$(libscimetanet_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscimetanet_la_includedir)"
1162 @list='$(libscimetanet_la_include_HEADERS)'; test -n "$(libscimetanet_la_includedir)" || list=; \
1163 for p in $$list; do \
1164 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1165 echo "$$d$$p"; \
1166 done | $(am__base_list) | \
1167 while read files; do \
1168 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscimetanet_la_includedir)'"; \
1169 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscimetanet_la_includedir)" || exit $$?; \
1170 done
1171
1172uninstall-libscimetanet_la_includeHEADERS:
1173 @$(NORMAL_UNINSTALL)
1174 @list='$(libscimetanet_la_include_HEADERS)'; test -n "$(libscimetanet_la_includedir)" || list=; \
1175 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1176 test -n "$$files" || exit 0; \
1177 echo " ( cd '$(DESTDIR)$(libscimetanet_la_includedir)' && rm -f" $$files ")"; \
1178 cd "$(DESTDIR)$(libscimetanet_la_includedir)" && rm -f $$files
1179 1154
1180ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 1155ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1181 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 1156 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1262,9 +1237,9 @@ distdir: $(DISTFILES)
1262check-am: all-am 1237check-am: all-am
1263 $(MAKE) $(AM_MAKEFLAGS) check-local 1238 $(MAKE) $(AM_MAKEFLAGS) check-local
1264check: check-am 1239check: check-am
1265all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local 1240all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
1266installdirs: 1241installdirs:
1267 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscimetanet_la_etcdir)" "$(DESTDIR)$(libscimetanet_la_rootdir)" "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" "$(DESTDIR)$(libscimetanet_la_includedir)"; do \ 1242 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscimetanet_la_etcdir)" "$(DESTDIR)$(libscimetanet_la_rootdir)" "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)"; do \
1268 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 1243 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1269 done 1244 done
1270install: install-am 1245install: install-am
@@ -1316,7 +1291,6 @@ info: info-am
1316info-am: 1291info-am:
1317 1292
1318install-data-am: install-data-local install-libscimetanet_la_etcDATA \ 1293install-data-am: install-data-local install-libscimetanet_la_etcDATA \
1319 install-libscimetanet_la_includeHEADERS \
1320 install-libscimetanet_la_rootDATA \ 1294 install-libscimetanet_la_rootDATA \
1321 install-libscimetanet_la_sci_gatewayDATA 1295 install-libscimetanet_la_sci_gatewayDATA
1322 1296
@@ -1365,7 +1339,6 @@ ps: ps-am
1365ps-am: 1339ps-am:
1366 1340
1367uninstall-am: uninstall-libscimetanet_la_etcDATA \ 1341uninstall-am: uninstall-libscimetanet_la_etcDATA \
1368 uninstall-libscimetanet_la_includeHEADERS \
1369 uninstall-libscimetanet_la_rootDATA \ 1342 uninstall-libscimetanet_la_rootDATA \
1370 uninstall-libscimetanet_la_sci_gatewayDATA \ 1343 uninstall-libscimetanet_la_sci_gatewayDATA \
1371 uninstall-pkglibLTLIBRARIES 1344 uninstall-pkglibLTLIBRARIES
@@ -1382,7 +1355,6 @@ uninstall-am: uninstall-libscimetanet_la_etcDATA \
1382 install-exec-am install-html install-html-am \ 1355 install-exec-am install-html install-html-am \
1383 install-html-local install-info install-info-am \ 1356 install-html-local install-info install-info-am \
1384 install-libscimetanet_la_etcDATA \ 1357 install-libscimetanet_la_etcDATA \
1385 install-libscimetanet_la_includeHEADERS \
1386 install-libscimetanet_la_rootDATA \ 1358 install-libscimetanet_la_rootDATA \
1387 install-libscimetanet_la_sci_gatewayDATA install-man \ 1359 install-libscimetanet_la_sci_gatewayDATA install-man \
1388 install-pdf install-pdf-am install-pkglibLTLIBRARIES \ 1360 install-pdf install-pdf-am install-pkglibLTLIBRARIES \
@@ -1391,7 +1363,6 @@ uninstall-am: uninstall-libscimetanet_la_etcDATA \
1391 maintainer-clean-generic mostlyclean mostlyclean-compile \ 1363 maintainer-clean-generic mostlyclean mostlyclean-compile \
1392 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 1364 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1393 tags uninstall uninstall-am uninstall-libscimetanet_la_etcDATA \ 1365 tags uninstall uninstall-am uninstall-libscimetanet_la_etcDATA \
1394 uninstall-libscimetanet_la_includeHEADERS \
1395 uninstall-libscimetanet_la_rootDATA \ 1366 uninstall-libscimetanet_la_rootDATA \
1396 uninstall-libscimetanet_la_sci_gatewayDATA \ 1367 uninstall-libscimetanet_la_sci_gatewayDATA \
1397 uninstall-pkglibLTLIBRARIES 1368 uninstall-pkglibLTLIBRARIES
diff --git a/scilab/modules/metanet/metanet.iss b/scilab/modules/metanet/metanet.iss
index 36a8fb9..e060a73 100644
--- a/scilab/modules/metanet/metanet.iss
+++ b/scilab/modules/metanet/metanet.iss
@@ -34,7 +34,7 @@ Source: modules\{#METANET}\etc\{#METANET}.start; DestDir: {app}\modules\{#METANE
34; 34;
35Source: modules\{#METANET}\help\addchapter.sce; DestDir: {app}\modules\{#METANET}\help; Flags: recursesubdirs; Components: {#COMPN_METANET} 35Source: modules\{#METANET}\help\addchapter.sce; DestDir: {app}\modules\{#METANET}\help; Flags: recursesubdirs; Components: {#COMPN_METANET}
36; 36;
37Source: modules\{#METANET}\includes\*.h; DestDir: {app}\modules\{#METANET}\includes; Components: {#COMPN_METANET} 37;Source: modules\{#METANET}\includes\*.h; DestDir: {app}\modules\{#METANET}\includes; Components: {#COMPN_METANET}
38; 38;
39Source: modules\{#METANET}\macros\editor\lib; DestDir: {app}\modules\{#METANET}\macros\editor; Components: {#COMPN_METANET} 39Source: modules\{#METANET}\macros\editor\lib; DestDir: {app}\modules\{#METANET}\macros\editor; Components: {#COMPN_METANET}
40Source: modules\{#METANET}\macros\editor\names; DestDir: {app}\modules\{#METANET}\macros\editor; Components: {#COMPN_METANET} 40Source: modules\{#METANET}\macros\editor\names; DestDir: {app}\modules\{#METANET}\macros\editor; Components: {#COMPN_METANET}