add some headers for metanet module SEP 35 updated 08/1608/2
Allan CORNET [Tue, 17 Aug 2010 09:20:24 +0000 (11:20 +0200)]
Change-Id: I299919fab80b239c8cfb32c4d9f29bf1e73948c0

SEP/SEP_35_selection_of_installed_header.odt
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.iss
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/cerro.h
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/src/c/output_stream_export.def

index 937e260..3a9e01c 100644 (file)
Binary files a/SEP/SEP_35_selection_of_installed_header.odt and b/SEP/SEP_35_selection_of_installed_header.odt differ
index 3c31021..bbce8d9 100644 (file)
@@ -151,4 +151,9 @@ libscifileio_la_etc_DATA = etc/fileio.quit etc/fileio.start
 libscifileio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 
+#### fileio : include files ####
+libscifileio_la_includedir=$(pkgincludedir)
+libscifileio_la_include_HEADERS = includes/getFullFilename.h \
+includes/dynlib_fileio.h
+
 include $(top_srcdir)/Makefile.incl.am
index 98c7dbe..f50bfc9 100644 (file)
@@ -37,6 +37,7 @@
 ##########
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -56,8 +57,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(top_srcdir)/Makefile.incl.am
+DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
 @NEED_JAVA_TRUE@am__append_1 = java
 
 # With --enable-compilation-tests, launch java unitary tests
@@ -108,7 +109,8 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscifileio_la_etcdir)" \
        "$(DESTDIR)$(libscifileio_la_rootdir)" \
-       "$(DESTDIR)$(libscifileio_la_sci_gatewaydir)"
+       "$(DESTDIR)$(libscifileio_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscifileio_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscifileio_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
@@ -200,6 +202,7 @@ SOURCES = $(libscifileio_la_SOURCES)
 DIST_SOURCES = $(libscifileio_la_SOURCES)
 DATA = $(libscifileio_la_etc_DATA) $(libscifileio_la_root_DATA) \
        $(libscifileio_la_sci_gateway_DATA)
+HEADERS = $(libscifileio_la_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -590,6 +593,12 @@ libscifileio_la_etc_DATA = etc/fileio.quit etc/fileio.start
 libscifileio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 
+#### fileio : include files ####
+libscifileio_la_includedir = $(pkgincludedir)
+libscifileio_la_include_HEADERS = includes/getFullFilename.h \
+includes/dynlib_fileio.h
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -1565,6 +1574,26 @@ uninstall-libscifileio_la_sci_gatewayDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(libscifileio_la_sci_gatewaydir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(libscifileio_la_sci_gatewaydir)" && rm -f $$files
+install-libscifileio_la_includeHEADERS: $(libscifileio_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscifileio_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscifileio_la_includedir)"
+       @list='$(libscifileio_la_include_HEADERS)'; test -n "$(libscifileio_la_includedir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscifileio_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscifileio_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libscifileio_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscifileio_la_include_HEADERS)'; test -n "$(libscifileio_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscifileio_la_includedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscifileio_la_includedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1651,9 +1680,9 @@ distdir: $(DISTFILES)
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscifileio_la_etcdir)" "$(DESTDIR)$(libscifileio_la_rootdir)" "$(DESTDIR)$(libscifileio_la_sci_gatewaydir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscifileio_la_etcdir)" "$(DESTDIR)$(libscifileio_la_rootdir)" "$(DESTDIR)$(libscifileio_la_sci_gatewaydir)" "$(DESTDIR)$(libscifileio_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -1705,6 +1734,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libscifileio_la_etcDATA \
+       install-libscifileio_la_includeHEADERS \
        install-libscifileio_la_rootDATA \
        install-libscifileio_la_sci_gatewayDATA
 
@@ -1753,6 +1783,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libscifileio_la_etcDATA \
+       uninstall-libscifileio_la_includeHEADERS \
        uninstall-libscifileio_la_rootDATA \
        uninstall-libscifileio_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
@@ -1769,6 +1800,7 @@ uninstall-am: uninstall-libscifileio_la_etcDATA \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
        install-libscifileio_la_etcDATA \
+       install-libscifileio_la_includeHEADERS \
        install-libscifileio_la_rootDATA \
        install-libscifileio_la_sci_gatewayDATA install-man \
        install-pdf install-pdf-am install-pkglibLTLIBRARIES \
@@ -1777,6 +1809,7 @@ uninstall-am: uninstall-libscifileio_la_etcDATA \
        maintainer-clean-generic mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
        tags uninstall uninstall-am uninstall-libscifileio_la_etcDATA \
+       uninstall-libscifileio_la_includeHEADERS \
        uninstall-libscifileio_la_rootDATA \
        uninstall-libscifileio_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
index 8910f4c..c040f60 100644 (file)
@@ -29,6 +29,8 @@ Source: modules\{#FILEIO}\etc\{#FILEIO}.quit; DestDir: {app}\modules\{#FILEIO}\e
 Source: modules\{#FILEIO}\etc\{#FILEIO}.start; DestDir: {app}\modules\{#FILEIO}\etc; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#FILEIO}\includes\*.h; DestDir: {app}\modules\{#FILEIO}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#FILEIO}\includes\getFullFilename.h; DestDir: {app}\modules\{#FILEIO}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#FILEIO}\includes\dynlib_fileio.h; DestDir: {app}\modules\{#FILEIO}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: bin\fileio.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
index 66f7ff9..a3723cf 100644 (file)
@@ -109,6 +109,7 @@ libscioutput_stream_la_sci_gateway_DATA = sci_gateway/output_stream_gateway.xml
 libscioutput_stream_la_includedir=$(pkgincludedir)
 libscioutput_stream_la_include_HEADERS = includes/do_error_number.h \
 includes/sciprint.h \
+includes/cerro.h \
 includes/Scierror.h
 
 include $(top_srcdir)/Makefile.incl.am
index fcb4126..6371231 100644 (file)
@@ -533,6 +533,7 @@ libscioutput_stream_la_sci_gateway_DATA = sci_gateway/output_stream_gateway.xml
 libscioutput_stream_la_includedir = $(pkgincludedir)
 libscioutput_stream_la_include_HEADERS = includes/do_error_number.h \
 includes/sciprint.h \
+includes/cerro.h \
 includes/Scierror.h
 
 
index d8e820d..d610ba2 100644 (file)
 #ifndef __CERRO_H__
 #define __CERRO_H__
 /*--------------------------------------------------------------------------*/ 
-#include "dynlib_output_stream.h"
-
 /*
 * cerro
 */
-OUTPUT_STREAM_IMPEXP void cerro(char *str);
+void cerro(char *str);
 
 #endif /*__CERRO_H__*/
 /*--------------------------------------------------------------------------*/ 
index 5f82acf..915db0d 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#OUTPUT_STREAM}\version.xml; DestDir: {app}\modules\{#OUTPUT_ST
 Source: modules\{#OUTPUT_STREAM}\includes\Scierror.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\includes\sciprint.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\includes\do_error_number.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#OUTPUT_STREAM}\includes\cerro.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\includes\dynlib_output_stream.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#OUTPUT_STREAM}\sci_gateway\{#OUTPUT_STREAM}_gateway.xml; DestDir: {app}\modules\{#OUTPUT_STREAM}\sci_gateway; Components: {#COMPN_SCILAB}