summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-01-26 11:41:01 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-01-26 11:41:01 +0100
commitb647c4f12fc297552aad087b7b3caa585382248b (patch)
tree0845f041feeb704a09803a1346a06382a9cee860 /scilab/modules/intersci
parentff3fb6e4b17709fc36db10fa4c41f2ed64165746 (diff)
parenta886d411e2b4b19da5b84d1645033d4c140857c4 (diff)
downloadscilab-b647c4f12fc297552aad087b7b3caa585382248b.zip
scilab-b647c4f12fc297552aad087b7b3caa585382248b.tar.gz
Merge branch 'master' of git.scilab.org:scilab
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.am1
-rw-r--r--scilab/modules/intersci/Makefile.in38
-rw-r--r--scilab/modules/intersci/locales/en_US/intersci.pot2
3 files changed, 36 insertions, 5 deletions
diff --git a/scilab/modules/intersci/Makefile.am b/scilab/modules/intersci/Makefile.am
index 8c6fdac..cc86fe8 100644
--- a/scilab/modules/intersci/Makefile.am
+++ b/scilab/modules/intersci/Makefile.am
@@ -22,6 +22,7 @@ src/exe/opt.c \
22src/exe/check.c 22src/exe/check.c
23 23
24libsciintersci_la_includedir=$(pkgincludedir) 24libsciintersci_la_includedir=$(pkgincludedir)
25libsciintersci_la_include_HEADERS = includes/libinter.h
25 26
26pkglib_LTLIBRARIES = libsciintersci.la 27pkglib_LTLIBRARIES = libsciintersci.la
27 28
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 628d3d5..3a270bc 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -38,6 +38,7 @@
38 38
39 39
40 40
41
41VPATH = @srcdir@ 42VPATH = @srcdir@
42pkgdatadir = $(datadir)/@PACKAGE@ 43pkgdatadir = $(datadir)/@PACKAGE@
43pkgincludedir = $(includedir)/@PACKAGE@ 44pkgincludedir = $(includedir)/@PACKAGE@
@@ -58,7 +59,8 @@ POST_UNINSTALL = :
58build_triplet = @build@ 59build_triplet = @build@
59host_triplet = @host@ 60host_triplet = @host@
60bin_PROGRAMS = intersci$(EXEEXT) 61bin_PROGRAMS = intersci$(EXEEXT)
61DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 62DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
63 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 64 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_1 = java 65@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/intersci 66subdir = modules/intersci
@@ -106,7 +108,8 @@ am__base_list = \
106 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 108 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
107am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ 109am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
108 "$(DESTDIR)$(libsciintersci_la_etcdir)" \ 110 "$(DESTDIR)$(libsciintersci_la_etcdir)" \
109 "$(DESTDIR)$(libsciintersci_la_rootdir)" 111 "$(DESTDIR)$(libsciintersci_la_rootdir)" \
112 "$(DESTDIR)$(libsciintersci_la_includedir)"
110LTLIBRARIES = $(pkglib_LTLIBRARIES) 113LTLIBRARIES = $(pkglib_LTLIBRARIES)
111libsciintersci_la_DEPENDENCIES = \ 114libsciintersci_la_DEPENDENCIES = \
112 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 115 $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -143,6 +146,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
143SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES) 146SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES)
144DIST_SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES) 147DIST_SOURCES = $(libsciintersci_la_SOURCES) $(intersci_SOURCES)
145DATA = $(libsciintersci_la_etc_DATA) $(libsciintersci_la_root_DATA) 148DATA = $(libsciintersci_la_etc_DATA) $(libsciintersci_la_root_DATA)
149HEADERS = $(libsciintersci_la_include_HEADERS)
146ETAGS = etags 150ETAGS = etags
147CTAGS = ctags 151CTAGS = ctags
148DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 152DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -398,6 +402,7 @@ src/exe/opt.c \
398src/exe/check.c 402src/exe/check.c
399 403
400libsciintersci_la_includedir = $(pkgincludedir) 404libsciintersci_la_includedir = $(pkgincludedir)
405libsciintersci_la_include_HEADERS = includes/libinter.h
401pkglib_LTLIBRARIES = libsciintersci.la 406pkglib_LTLIBRARIES = libsciintersci.la
402libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 407libsciintersci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
403intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES) 408intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
@@ -858,6 +863,26 @@ uninstall-libsciintersci_la_rootDATA:
858 test -n "$$files" || exit 0; \ 863 test -n "$$files" || exit 0; \
859 echo " ( cd '$(DESTDIR)$(libsciintersci_la_rootdir)' && rm -f" $$files ")"; \ 864 echo " ( cd '$(DESTDIR)$(libsciintersci_la_rootdir)' && rm -f" $$files ")"; \
860 cd "$(DESTDIR)$(libsciintersci_la_rootdir)" && rm -f $$files 865 cd "$(DESTDIR)$(libsciintersci_la_rootdir)" && rm -f $$files
866install-libsciintersci_la_includeHEADERS: $(libsciintersci_la_include_HEADERS)
867 @$(NORMAL_INSTALL)
868 test -z "$(libsciintersci_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciintersci_la_includedir)"
869 @list='$(libsciintersci_la_include_HEADERS)'; test -n "$(libsciintersci_la_includedir)" || list=; \
870 for p in $$list; do \
871 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
872 echo "$$d$$p"; \
873 done | $(am__base_list) | \
874 while read files; do \
875 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciintersci_la_includedir)'"; \
876 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciintersci_la_includedir)" || exit $$?; \
877 done
878
879uninstall-libsciintersci_la_includeHEADERS:
880 @$(NORMAL_UNINSTALL)
881 @list='$(libsciintersci_la_include_HEADERS)'; test -n "$(libsciintersci_la_includedir)" || list=; \
882 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
883 test -n "$$files" || exit 0; \
884 echo " ( cd '$(DESTDIR)$(libsciintersci_la_includedir)' && rm -f" $$files ")"; \
885 cd "$(DESTDIR)$(libsciintersci_la_includedir)" && rm -f $$files
861 886
862ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 887ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
863 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 888 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -944,9 +969,10 @@ distdir: $(DISTFILES)
944check-am: all-am 969check-am: all-am
945 $(MAKE) $(AM_MAKEFLAGS) check-local 970 $(MAKE) $(AM_MAKEFLAGS) check-local
946check: check-am 971check: check-am
947all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local 972all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
973 all-local
948installdirs: 974installdirs:
949 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libsciintersci_la_etcdir)" "$(DESTDIR)$(libsciintersci_la_rootdir)"; do \ 975 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libsciintersci_la_etcdir)" "$(DESTDIR)$(libsciintersci_la_rootdir)" "$(DESTDIR)$(libsciintersci_la_includedir)"; do \
950 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 976 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
951 done 977 done
952install: install-am 978install: install-am
@@ -998,6 +1024,7 @@ info: info-am
998info-am: 1024info-am:
999 1025
1000install-data-am: install-data-local install-libsciintersci_la_etcDATA \ 1026install-data-am: install-data-local install-libsciintersci_la_etcDATA \
1027 install-libsciintersci_la_includeHEADERS \
1001 install-libsciintersci_la_rootDATA 1028 install-libsciintersci_la_rootDATA
1002 1029
1003install-dvi: install-dvi-am 1030install-dvi: install-dvi-am
@@ -1046,6 +1073,7 @@ ps-am:
1046 1073
1047uninstall-am: uninstall-binPROGRAMS \ 1074uninstall-am: uninstall-binPROGRAMS \
1048 uninstall-libsciintersci_la_etcDATA \ 1075 uninstall-libsciintersci_la_etcDATA \
1076 uninstall-libsciintersci_la_includeHEADERS \
1049 uninstall-libsciintersci_la_rootDATA \ 1077 uninstall-libsciintersci_la_rootDATA \
1050 uninstall-pkglibLTLIBRARIES 1078 uninstall-pkglibLTLIBRARIES
1051 1079
@@ -1061,6 +1089,7 @@ uninstall-am: uninstall-binPROGRAMS \
1061 install-dvi-am install-exec install-exec-am install-html \ 1089 install-dvi-am install-exec install-exec-am install-html \
1062 install-html-am install-html-local install-info \ 1090 install-html-am install-html-local install-info \
1063 install-info-am install-libsciintersci_la_etcDATA \ 1091 install-info-am install-libsciintersci_la_etcDATA \
1092 install-libsciintersci_la_includeHEADERS \
1064 install-libsciintersci_la_rootDATA install-man install-pdf \ 1093 install-libsciintersci_la_rootDATA install-man install-pdf \
1065 install-pdf-am install-pkglibLTLIBRARIES install-ps \ 1094 install-pdf-am install-pkglibLTLIBRARIES install-ps \
1066 install-ps-am install-strip installcheck installcheck-am \ 1095 install-ps-am install-strip installcheck installcheck-am \
@@ -1069,6 +1098,7 @@ uninstall-am: uninstall-binPROGRAMS \
1069 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ 1098 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
1070 uninstall-am uninstall-binPROGRAMS \ 1099 uninstall-am uninstall-binPROGRAMS \
1071 uninstall-libsciintersci_la_etcDATA \ 1100 uninstall-libsciintersci_la_etcDATA \
1101 uninstall-libsciintersci_la_includeHEADERS \
1072 uninstall-libsciintersci_la_rootDATA \ 1102 uninstall-libsciintersci_la_rootDATA \
1073 uninstall-pkglibLTLIBRARIES 1103 uninstall-pkglibLTLIBRARIES
1074 1104
diff --git a/scilab/modules/intersci/locales/en_US/intersci.pot b/scilab/modules/intersci/locales/en_US/intersci.pot
index 77582a0..b25cdf0 100644
--- a/scilab/modules/intersci/locales/en_US/intersci.pot
+++ b/scilab/modules/intersci/locales/en_US/intersci.pot
@@ -14,5 +14,5 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2009-12-09 16:34+0100\n" 17"Revision-Date: 2010-01-25 10:32+0100\n"
18 18