- Add missing files
Pierre MARECHAL [Wed, 18 Mar 2009 16:30:21 +0000 (17:30 +0100)]
 - Fix Makefile.am

scilab/modules/atoms/Makefile.am
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/changelog.txt [new file with mode: 0644]
scilab/modules/atoms/license.txt [new file with mode: 0644]
scilab/modules/atoms/readme.txt [new file with mode: 0644]
scilab/modules/atoms/version.xml [new file with mode: 0644]

index 103109c..3ced7ee 100644 (file)
@@ -1,6 +1,20 @@
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) 2009 - DIGITEO
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
 modulename=atoms
 
-include $(top_srcdir)/Makefile.incl.am
+#### atoms : Conf files ####
+libsciatoms_la_rootdir = $(mydatadir)
+libsciatoms_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 
+#### atoms : init scripts ####
 libsciatoms_la_etcdir = $(mydatadir)/etc
 libsciatoms_la_etc_DATA = etc/atoms.quit etc/atoms.start
+
+include $(top_srcdir)/Makefile.incl.am
index 4c1ecf8..1a8c489 100644 (file)
 @SET_MAKE@
 
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) 2009 - DIGITEO
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 # Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 #
@@ -78,9 +87,11 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libsciatoms_la_etcdir)"
+am__installdirs = "$(DESTDIR)$(libsciatoms_la_etcdir)" \
+       "$(DESTDIR)$(libsciatoms_la_rootdir)"
 libsciatoms_la_etcDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(libsciatoms_la_etc_DATA)
+libsciatoms_la_rootDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(libsciatoms_la_etc_DATA) $(libsciatoms_la_root_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -214,6 +225,7 @@ WITH_OCAML = @WITH_OCAML@
 XGETTEXT = @XGETTEXT@
 XMKMF = @XMKMF@
 XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
+XML_APIS_EXT = @XML_APIS_EXT@
 XML_CONFIG = @XML_CONFIG@
 XML_FLAGS = @XML_FLAGS@
 XML_LIBS = @XML_LIBS@
@@ -276,6 +288,14 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 modulename = atoms
 
+#### atoms : Conf files ####
+libsciatoms_la_rootdir = $(mydatadir)
+libsciatoms_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+#### atoms : init scripts ####
+libsciatoms_la_etcdir = $(mydatadir)/etc
+libsciatoms_la_etc_DATA = etc/atoms.quit etc/atoms.start
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -308,7 +328,7 @@ pkgdocdir = $(mydatadir)
 DOCMASKXML = *.xml
 
 ########### INSTALL DATA ###################
-# Install macros
+# Install macros, help & demos
 # Where it should be installed
 pkgmacrosdir = $(mydatadir)
 # Which directory we process
@@ -319,17 +339,21 @@ MACROMASK = *.sci
 MACROBUILDMASK = *.sce
 # Mask of the Scilab compiled macros
 MACROBINMASK = *.bin
-# List of the function of a module
+# List of the standard directory for tests
 TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
-# Where to export JAVA files (.jar)
+# Where the demos should be installed
+pkgdemosdir = $(mydatadir)
+# List of the standard directory for demos
+DEMOS_DIR = demos
+# List of the standard directory for examples
+EXAMPLES_DIR = examples
+# Where to export JAVA archives (.jar)
 JARDIR = jar/
-# JAR files
+# JAR files mask
 JARMASK = *.jar
 # Chapter file 
 HELP_CHAPTERDIR = help/
 HELP_CHAPTERFILE = addchapter.sce
-libsciatoms_la_etcdir = $(mydatadir)/etc
-libsciatoms_la_etc_DATA = etc/atoms.quit etc/atoms.start
 all: all-am
 
 .SUFFIXES:
@@ -386,6 +410,23 @@ uninstall-libsciatoms_la_etcDATA:
          echo " rm -f '$(DESTDIR)$(libsciatoms_la_etcdir)/$$f'"; \
          rm -f "$(DESTDIR)$(libsciatoms_la_etcdir)/$$f"; \
        done
+install-libsciatoms_la_rootDATA: $(libsciatoms_la_root_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(libsciatoms_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciatoms_la_rootdir)"
+       @list='$(libsciatoms_la_root_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(libsciatoms_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciatoms_la_rootdir)/$$f'"; \
+         $(libsciatoms_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciatoms_la_rootdir)/$$f"; \
+       done
+
+uninstall-libsciatoms_la_rootDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libsciatoms_la_root_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(libsciatoms_la_rootdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libsciatoms_la_rootdir)/$$f"; \
+       done
 tags: TAGS
 TAGS:
 
@@ -424,7 +465,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(libsciatoms_la_etcdir)"; do \
+       for dir in "$(DESTDIR)$(libsciatoms_la_etcdir)" "$(DESTDIR)$(libsciatoms_la_rootdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -457,7 +498,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-local
 
 dvi: dvi-am
 
@@ -469,7 +510,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-libsciatoms_la_etcDATA
+install-data-am: install-data-local install-libsciatoms_la_etcDATA \
+       install-libsciatoms_la_rootDATA
 
 install-dvi: install-dvi-am
 
@@ -505,23 +547,26 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libsciatoms_la_etcDATA
+uninstall-am: uninstall-libsciatoms_la_etcDATA \
+       uninstall-libsciatoms_la_rootDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am check-local clean \
        clean-generic clean-libtool clean-local distclean \
-       distclean-generic distclean-libtool distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-data-local install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libsciatoms_la_etcDATA install-man install-pdf \
+       distclean-generic distclean-libtool distclean-local distdir \
+       dvi dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libsciatoms_la_etcDATA \
+       install-libsciatoms_la_rootDATA install-man install-pdf \
        install-pdf-am install-ps install-ps-am install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-libsciatoms_la_etcDATA
+       uninstall-libsciatoms_la_etcDATA \
+       uninstall-libsciatoms_la_rootDATA
 
 
 # This target enables tests for Scilab
@@ -620,7 +665,7 @@ install-data-local:
        for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
          if test -d $(srcdir)/$$dir/; then \
            $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-                 for file in `find $(srcdir)/$$dir | grep -v '\.svn' | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
+                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
                    if test -d "$(srcdir)/$$dir/$$file"; then \
                          echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
                          $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
@@ -630,7 +675,7 @@ install-data-local:
                    fi \
                  done; \
          fi; \
-       done 
+       done
 # Install the help chapter
        @echo "-------- Install the help chapter (if any) --------"; \
        for lang in $(ALL_LINGUAS); do \
@@ -642,6 +687,22 @@ install-data-local:
                        $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
                fi; \
        done
+# Install the demos & examples
+       @echo "-------- Install demos & examples (if any) --------"; \
+       for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
+         if test -d $(srcdir)/$$dir/; then \
+           $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
+                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
+                   if test -d "$(srcdir)/$$dir/$$file"; then \
+                         echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
+                         $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
+                   else \
+                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
+                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
+                   fi \
+                 done; \
+         fi; \
+       done
 # Install the macros
        @echo "-------- Install macros (if any) --------"; \
        for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
@@ -673,6 +734,9 @@ install-data-local:
 @NEED_JAVA_TRUE@clean-local: clean-java clean-macros
 @NEED_JAVA_FALSE@clean-local: clean-macros
 
+distclean-local:
+       rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
+
 .PHONY: macros java swig giws
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scilab/modules/atoms/changelog.txt b/scilab/modules/atoms/changelog.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/atoms/license.txt b/scilab/modules/atoms/license.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/atoms/readme.txt b/scilab/modules/atoms/readme.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/atoms/version.xml b/scilab/modules/atoms/version.xml
new file mode 100644 (file)
index 0000000..f6ab886
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="atoms">
+<!-- =================== -->
+<!--
+ Scilab
+ Defines the version of a module
+===================
+
+-->
+
+
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Allan CORNET , Sylvestre LEDRU
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+
+<!-- =================== -->
+
+<VERSION major="5" minor="1" maintenance="0" revision="0" string="unstable-svn" />
+</MODULE_VERSION>