]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
First stable version after merging with V3_2_2
authorabd <abd@opencascade.com>
Thu, 19 Oct 2006 06:35:28 +0000 (06:35 +0000)
committerabd <abd@opencascade.com>
Thu, 19 Oct 2006 06:35:28 +0000 (06:35 +0000)
88 files changed:
DEPRECATED/configure.in.base
bin/Makefile.am
bin/appli_clean.sh
bin/appli_gen.py [new file with mode: 0644]
bin/appli_install.sh
bin/appliskel/README
bin/appliskel/SalomeApp.xml
bin/appliskel/env.d/envSalome.sh
bin/config_appli.xml [new file with mode: 0644]
bin/launchConfigureParser.py
bin/orbmodule.py
bin/runNS.py
bin/runSalome.py
bin/setenv.py
bin/virtual_salome.py
configure.ac
doc/INSTALL.txt
doc/README.cluster-CCRT [new file with mode: 0644]
doc/SALOME_Application.txt
doc/salome/tui/Makefile.am
doc/salome/version.texi
idl/SALOMEDS.idl
idl/SALOMEDS_Attributes.idl
salome_adm/unix/DEPRECATED/make_commence.in
salome_adm/unix/DEPRECATED/make_conclude.in
salome_adm/unix/DEPRECATED/make_module.in
salome_adm/unix/config_files/ac_cxx_depend_flag.m4
salome_adm/unix/config_files/check_cas.m4
salome_adm/unix/config_files/config.guess
salome_adm/unix/config_files/config.sub
salome_adm/unix/config_files/ltmain.sh
salome_adm/unix/config_files/production.m4
salome_adm/unix/make_common_starter.am
src/Batch/Batch_Parametre.hxx
src/Communication/Makefile.in
src/Container/Component_i.cxx
src/Container/Container_i.cxx
src/Container/Makefile.in
src/Container/SALOME_Component_i.hxx
src/KERNEL_PY/batchmode_salome.py
src/KERNEL_PY/import_hook.py
src/KERNEL_PY/kernel_shared_modules.py
src/KERNEL_PY/omnipatch.py
src/KERNEL_PY/salome_shared_modules.py
src/LifeCycleCORBA/SALOME_FileTransferCORBA.cxx
src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
src/LifeCycleCORBA_SWIG/Makefile.am
src/LifeCycleCORBA_SWIG/Test/LifeCycleCORBA_SWIGTest.py
src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
src/ModuleCatalog/Makefile.am
src/ModuleCatalog/Makefile.in
src/ModuleCatalog/TestModuleCatalog.py [new file with mode: 0755]
src/Notification/Makefile.in
src/Registry/Makefile.in
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
src/ResourcesManager/SALOME_ResourcesManager.cxx
src/SALOMEDS/Makefile.in
src/SALOMEDS/SALOMEDS.cxx
src/SALOMEDS/SALOMEDS_Attributes.hxx
src/SALOMEDS/SALOMEDS_Client.cxx
src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
src/SALOMEDS/SALOMEDS_SObject.cxx
src/SALOMEDS/SALOMEDS_Study.cxx
src/SALOMEDS/SALOMEDS_Study.hxx
src/SALOMEDS/SALOMEDS_Study_i.cxx
src/SALOMEDS/SALOMEDS_Study_i.hxx
src/SALOMEDS/Test/SALOMEDSTest.cxx
src/SALOMEDSClient/SALOMEDSClient_Study.hxx
src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx
src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
src/SALOMEDSImpl/testDS.cxx
src/Utils/SALOME_Utils.hxx
src/Utils/SalomeString.hxx
src/Utils/Utils_CommException.hxx
src/Utils/Utils_CorbaException.hxx
src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
src/Utils/Utils_Identity.cxx
src/Utils/Utils_Mutex.hxx
src/Utils/Utils_ORB_INIT.hxx
src/Utils/Utils_SALOME_Exception.hxx
src/Utils/Utils_SINGLETON.hxx
src/Utils/Utils_SignalsHandler.h
src/Utils/Utils_Timer.hxx

index 1567a6394ecc18ae85f21ecb42e93831a7456e80..58c19e522960c630fd5e3ffc4d8bab2d8587a0fb 100644 (file)
@@ -22,11 +22,15 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
+VERSION=3.2.1
 AC_SUBST(VERSION)
-XVERSION=0x030200
+XVERSION=0x030201
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=kernel
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -412,8 +416,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
-do
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
 #   fi
index 2120709f640edeb59a64c512528e23721b195675..fbb9625284eb3fac77c28708c30b82a6d746c96a 100644 (file)
@@ -51,11 +51,16 @@ dist_salomescript_SCRIPTS=\
        createAppli.sh \
        appli_install.sh \
        appli_clean.sh \
+       appli_gen.py \
        virtual_salome.py \
+       config_appli.xml \
        launchConfigureParser.py \
        showNS.py \
        addToKillList.py \
-       NSparam.py
+       NSparam.py \
+       setenv.py \
+       launchSalome.py \
+       runNS.py
 
 EXTRA_DIST = appliskel
 
index c8cadf964187fb8522ddc26e19dabf1526bac5bc..0046e946cc96733aef2d41b8f0ee85747b726cfc 100644 (file)
@@ -20,4 +20,4 @@
 # 
 
 #clean appli
-rm -rf bin lib share doc envd setAppliPath.sh searchFreePort.sh runAppli runConsole runSession env.d
+rm -rf bin lib share doc  env.d envd setAppliPath.sh searchFreePort.sh runAppli runConsole runSession runRemote.sh runTests SalomeApp.xml *.pyc *~ .bashrc
diff --git a/bin/appli_gen.py b/bin/appli_gen.py
new file mode 100644 (file)
index 0000000..6d70fe9
--- /dev/null
@@ -0,0 +1,247 @@
+#!/usr/bin/env python
+"""Create a virtual Salome installation
+
+"""
+usage="""usage: %prog [options]
+Typical use is:
+  python appli_gen.py 
+Use with options:
+  python appli_gen.py --prefix=<install directory> --config=<configuration file>
+"""
+
+import os, glob, string, sys, re
+import xml.sax
+import optparse
+import virtual_salome
+
+# --- names of tags in XML configuration file
+appli_tag   = "application"
+prereq_tag  = "prerequisites"
+modules_tag = "modules"
+module_tag  = "module"
+samples_tag = "samples"
+
+# --- names of attributes in XML configuration file
+nam_att  = "name"
+path_att = "path"
+gui_att  = "gui"
+
+# -----------------------------------------------------------------------------
+
+# --- xml reader for SALOME application configuration file
+
+class xml_parser:
+    def __init__(self, fileName ):
+        print "Configure parser: processing %s ..." % fileName
+        self.space = []
+        self.config = {}
+        self.config["modules"] = []
+        self.config["guimodules"] = []
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(self)
+        parser.parse(fileName)
+        pass
+
+    def boolValue( self, str ):
+        if str in ("yes", "y", "1"):
+            return 1
+        elif str in ("no", "n", "0"):
+            return 0
+        else:
+            return str
+        pass
+
+    def startElement(self, name, attrs):
+        self.space.append(name)
+        self.current = None
+        # --- if we are analyzing "prerequisites" element then store its "path" attribute
+        if self.space == [appli_tag, prereq_tag] and path_att in attrs.getNames():
+            self.config["prereq_path"] = attrs.getValue( path_att )
+            pass
+        # --- if we are analyzing "samples" element then store its "path" attribute
+        if self.space == [appli_tag, samples_tag] and path_att in attrs.getNames():
+            self.config["samples_path"] = attrs.getValue( path_att )
+            pass
+        # --- if we are analyzing "module" element then store its "name" and "path" attributes
+        elif self.space == [appli_tag,modules_tag,module_tag] and \
+            nam_att in attrs.getNames() and \
+            path_att in attrs.getNames():
+            nam = attrs.getValue( nam_att )
+            path = attrs.getValue( path_att )
+            gui = 1
+            if gui_att in attrs.getNames():
+                gui = self.boolValue(attrs.getValue( gui_att ))
+                pass
+            self.config["modules"].append(nam)
+            self.config[nam]=path
+            if gui:
+                self.config["guimodules"].append(nam)
+                pass
+            pass
+        pass
+
+    def endElement(self, name):
+        p = self.space.pop()
+        self.current = None
+        pass
+
+    def characters(self, content):
+        pass
+
+    def processingInstruction(self, target, data):
+        pass
+
+    def setDocumentLocator(self, locator):
+        pass
+
+    def startDocument(self):
+        self.read = None
+        pass
+
+    def endDocument(self):
+        self.read = None
+        pass
+
+# -----------------------------------------------------------------------------
+
+class params:
+    pass
+
+# -----------------------------------------------------------------------------
+
+def install(prefix,config_file):
+    home_dir=os.path.abspath(os.path.expanduser(prefix))
+    filename=os.path.abspath(os.path.expanduser(config_file))
+    _config={}
+    try:
+        p = xml_parser(filename)
+        _config = p.config
+    except xml.sax.SAXParseException, inst:
+        print inst.getMessage()
+        print "Configure parser: parse error in configuration file %s" % filename
+        pass
+    except xml.sax.SAXException, inst:
+        print inst.args   
+        print "Configure parser: error in configuration file %s" % filename
+        pass
+    except:
+        print "Configure parser: Error : can not read configuration file %s, check existence and rights" % filename
+        pass
+
+    for cle in _config.keys():
+        print cle, _config[cle]
+        pass
+
+    for module in _config["modules"]:
+        print "--- add module ", module, _config[module]
+        options = params()
+        options.verbose=0
+        options.clear=0
+        options.prefix=home_dir
+        options.module=_config[module]
+        virtual_salome.link_module(options)
+        pass
+
+    appliskel_dir=os.path.join(home_dir,'bin','salome','appliskel')
+
+    for fn in ('envd',
+               'setAppliPath.sh',
+               'searchFreePort.sh',
+               'runRemote.sh',
+               'runAppli',
+               'runConsole',
+               'runSession',
+               'runTests',
+               '.bashrc',
+               ):
+        virtual_salome.symlink(os.path.join(appliskel_dir, fn),os.path.join(home_dir, fn))
+        pass
+
+    if filename != os.path.join(home_dir,"config_appli.xml"):
+        command = "cp -p " + filename + ' ' + os.path.join(home_dir,"config_appli.xml")
+        os.system(command)
+        pass
+       
+    virtual_salome.mkdir(os.path.join(home_dir,'env.d'))
+    if os.path.isfile(_config["prereq_path"]):
+        command='cp -p ' + _config["prereq_path"] + ' ' + os.path.join(home_dir,'env.d','envProducts.sh')
+        os.system(command)
+        pass
+    else:
+        print "WARNING: prerequisite file does not exist"
+        pass
+
+
+    f =open(os.path.join(home_dir,'env.d','configSalome.sh'),'w')
+    for module in _config["modules"]:
+        command='export '+ module + '_ROOT_DIR=' + home_dir +'\n'
+        f.write(command)
+        pass
+    if _config.has_key("samples_path"):
+        command='export DATA_DIR=' + _config["samples_path"] +'\n'
+        f.write(command)
+        pass
+    f.close()
+
+
+    f =open(os.path.join(home_dir,'env.d','configGUI.sh'),'w')
+    command = 'export SalomeAppConfig=' + home_dir +'\n'
+    f.write(command)
+    command = 'export SUITRoot=' + os.path.join(home_dir,'share','salome') +'\n'
+    f.write(command)
+    f.write('export DISABLE_FPE=1\n')
+    f.write('export MMGT_REENTRANT=1\n')
+    f.close()
+
+
+    f =open(os.path.join(home_dir,'SalomeApp.xml'),'w')
+    command="""<document>
+  <section name="launch">
+    <!-- SALOME launching parameters -->
+    <parameter name="gui"        value="yes"/>
+    <parameter name="splash"     value="yes"/>
+    <parameter name="file"       value="no"/>
+    <parameter name="key"        value="no"/>
+    <parameter name="interp"     value="no"/>
+    <parameter name="logger"     value="no"/>
+    <parameter name="xterm"      value="no"/>
+    <parameter name="portkill"   value="no"/>
+    <parameter name="killall"    value="no"/>
+    <parameter name="noexcepthandler"  value="no"/>
+    <parameter name="modules"    value="""
+    f.write(command)    
+    f.write('"')
+    for module in _config["guimodules"][:-1]:
+        f.write(module)
+        f.write(',')
+        pass
+    f.write(_config["guimodules"][-1])
+    f.write('"/>')
+    command="""
+    <parameter name="pyModules"  value=""/>
+    <parameter name="embedded"   value="SalomeAppEngine,study,cppContainer,registry,moduleCatalog"/>
+    <parameter name="standalone" value="pyContainer,supervContainer"/>
+  </section>
+</document>
+"""
+    f.write(command)    
+    f.close()
+
+def main():
+    parser = optparse.OptionParser(usage=usage)
+
+    parser.add_option('--prefix', dest="prefix", default='.',
+                      help="Installation directory (default .)")
+
+    parser.add_option('--config', dest="config", default='config_appli.xml',
+                      help="XML configuration file (default config_appli.xml)")
+
+    options, args = parser.parse_args()
+    install(prefix=options.prefix,config_file=options.config)
+    pass
+
+# -----------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    main()
+    pass
index 3e7c53f70393087d6aeffad397296cd2780c527e..37da0092e3f7378245cc3e064426702e83bd9ea0 100644 (file)
@@ -78,8 +78,7 @@ echo "export PYHELLO_ROOT_DIR=$APPLI_ROOT" >> env.d/configSalome.sh
 
 # --- GUI config
 
-echo "export config_var=$APPLI_ROOT:$APPLI_ROOT/share/salome/resources" >> env.d/configGUI.sh
-echo "export SUITRoot=$APPLI_ROOT/share/salome" >> env.d/configGUI.sh
+echo "export config_var=$APPLI_ROOT:$APPLI_ROOT/share/salome/resources/gui" >> env.d/configGUI.sh
 
 # --- SAMPLES directory
 
index f3f283cb8810a1ace8a842401179cd59866096d2..644da212258868b1388dc73d4fda6075571bf126 100644 (file)
@@ -90,7 +90,7 @@ CatalogRessources.xml
 
 SalomeApp.xml
    This file is similar to the default given
-   in ${GUI_ROOT_DIR}/share/salome/resources
+   in ${GUI_ROOT_DIR}/share/salome/resources/gui
 
 
 Proposal for env.d scripts
index 6897b713607193038a97d3cd8e43d258c4c75408..7caea4e037d724228ba3e7037fde60c1813b1085 100644 (file)
     <parameter name="translators" value="%P_msg_%L.qm|%P_icons.qm|%P_images.qm"/>
   </section>
   <section name="resources">
-    <parameter name="SUIT"         value="${SUITRoot}/resources"/>
-    <parameter name="STD"          value="${SUITRoot}/resources"/>
-    <parameter name="Plot2d"       value="${SUITRoot}/resources"/>
-    <parameter name="SPlot2d"      value="${SUITRoot}/resources"/>
-    <parameter name="GLViewer"     value="${SUITRoot}/resources"/>
-    <parameter name="OCCViewer"    value="${SUITRoot}/resources"/>
-    <parameter name="VTKViewer"    value="${SUITRoot}/resources"/>
-    <parameter name="SalomeApp"    value="${SUITRoot}/resources"/>
-    <parameter name="OB"           value="${SUITRoot}/resources"/>
-    <parameter name="CAM"          value="${SUITRoot}/resources"/>
-    <parameter name="GEOM"         value="${GEOM_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="VISU"         value="${VISU_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="SUPERV"       value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="MED"          value="${MED_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="GHS3DPlugin"  value="${GHS3DPLUGIN_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="COMPONENT"    value="${COMPONENT_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="PYHELLO"      value="${PYHELLO_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="PYCALCULATOR" value="${PYCALCULATOR_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="LIGHT"        value="${LIGHT_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SUIT"         value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="STD"          value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="Plot2d"       value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="SPlot2d"      value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="GLViewer"     value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="OCCViewer"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="VTKViewer"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="SalomeApp"    value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="OB"           value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="CAM"          value="${GUI_ROOT_DIR}/share/salome/resources/gui"/>
+    <parameter name="GEOM"         value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
+    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="VISU"         value="${VISU_ROOT_DIR}/share/salome/resources/visu"/>
+    <parameter name="SUPERV"       value="${SUPERV_ROOT_DIR}/share/salome/resources/superv"/>
+    <parameter name="MED"          value="${MED_ROOT_DIR}/share/salome/resources/med"/>
+    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources/netgenplugin"/>
+    <parameter name="GHS3DPlugin"  value="${GHS3DPLUGIN_ROOT_DIR}/share/salome/resources/ghs3dplugin"/>
+    <parameter name="COMPONENT"    value="${COMPONENT_ROOT_DIR}/share/salome/resources/component"/>
+    <parameter name="PYHELLO"      value="${PYHELLO_ROOT_DIR}/share/salome/resources/pyhello"/>
+    <parameter name="PYCALCULATOR" value="${PYCALCULATOR_ROOT_DIR}/share/salome/resources/pycalculator"/>
+    <parameter name="LIGHT"        value="${LIGHT_ROOT_DIR}/share/salome/resources/light"/>
 
   </section>
   <section name="GEOM">
index 5a6c6c48ea153ddde42ce9134402f2a0c505a5f0..ca620c35e24a45d69a0e1593a6b1ff4d7c6a4369 100644 (file)
@@ -29,9 +29,8 @@ REPINST=/home/prascle/SALOME2/Install
 export KERNEL_ROOT_DIR=${REPINST}/KERNEL_V301
 
 export GUI_ROOT_DIR=${REPINST}/GUI_V301
-#export SalomeAppConfig=${GUI_ROOT_DIR}/share/salome/resources
+#export SalomeAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui
 export SalomeAppConfig=${HOME}/${APPLI}
-export SUITRoot=${GUI_ROOT_DIR}/share/salome
 
 export GEOM_ROOT_DIR=${REPINST}/GEOM_V301
 export MED_ROOT_DIR=${REPINST}/MED_V301
diff --git a/bin/config_appli.xml b/bin/config_appli.xml
new file mode 100644 (file)
index 0000000..bd77993
--- /dev/null
@@ -0,0 +1,20 @@
+<application>
+<prerequisites path="/home/prascle/SALOME2/profileV322.sh"/>
+<modules>
+   <!-- variable name <MODULE>_ROOT_DIR is built with <MODULE> == name attribute value -->
+   <!-- <MODULE>_ROOT_DIR values is set with path attribute value -->
+   <!-- attribute gui (defaults = yes) indicates if the module has a gui interface -->
+   <module name="KERNEL"       gui="no"  path="/home/prascle/SALOME2/Install/KERNEL_V3_2_2"/>
+   <module name="GUI"          gui="no"  path="/home/prascle/SALOME2/Install/GUI_V3_2_2"/>
+   <module name="MED"                    path="/home/prascle/SALOME2/Install/MED_V3_2_2"/>
+   <module name="GEOM"                   path="/home/prascle/SALOME2/Install/GEOM_V3_2_2"/>
+   <module name="SMESH"                  path="/home/prascle/SALOME2/Install/SMESH_V3_2_2"/>
+   <module name="SUPERV"                 path="/home/prascle/SALOME2/Install/SUPERV_V3_2_2"/>
+   <module name="VISU"                   path="/home/prascle/SALOME2/Install/VISU_V3_2_2"/>
+   <module name="HELLO"                  path="/home/prascle/SALOME2/Install/HELLO1_V3_2_2"/>
+   <module name="PYHELLO"                path="/home/prascle/SALOME2/Install/PYHELLO1_V3_2_2"/>
+   <module name="NETGENPLUGIN" gui="no"  path="/home/prascle/SALOME2/Install/NETGENPLUGIN_V3_2_2"/>
+</modules>
+<samples path="/home/prascle/SALOME2/SAMPLES/V3_2_2/SAMPLES_SRC"/>
+</application>
+
index 222dd9e6792480d959fbf7c8c7c78f876c09ecd4..439bafda9bd3620cf535388b52bb748e4065aed9 100755 (executable)
@@ -2,29 +2,29 @@
 #           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either 
+# License as published by the Free Software Foundation; either
 # version 2.1 of the License.
-# 
-# This library is distributed in the hope that it will be useful 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#
+# This library is distributed in the hope that it will be useful
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public  
-# License along with this library; if not, write to the Free Software 
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-# 
+#
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-# 
+#
 import os, glob, string, sys, re
 import xml.sax
 
-# names of tags in XML configuration file 
+# names of tags in XML configuration file
 doc_tag = "document"
 sec_tag = "section"
 par_tag = "parameter"
 
-# names of attributes in XML configuration file 
+# names of attributes in XML configuration file
 nam_att = "name"
 val_att = "value"
 
@@ -53,6 +53,7 @@ plugins_nam    = "plugins"
 appname_nam    = "appname"
 port_nam       = "port"
 appname        = "SalomeApp"
+script_nam     = "pyscript"
 
 # values of boolean type (must be '0' or '1').
 # xml_parser.boolValue() is used for correct setting
@@ -63,13 +64,21 @@ listKeys = ( containers_nam, embedded_nam, key_nam, modules_nam, standalone_nam,
 
 # return application version (uses GUI_ROOT_DIR (or KERNEL_ROOT_DIR in batch mode) +/bin/salome/VERSION)
 def version():
-    root_dir = os.environ.get( 'KERNEL_ROOT_DIR', '' )     # KERNEL_ROOT_DIR or "" if not found
-    root_dir = os.environ.get( 'GUI_ROOT_DIR', root_dir )  # GUI_ROOT_DIR or KERNEL_ROOT_DIR or "" if both not found
-    filename = root_dir+'/bin/salome/VERSION'
-    str = open( filename, "r" ).readline() # str = "THIS IS SALOME - SALOMEGUI VERSION: 3.0.0"
-    match = re.search( r':\s+([a-zA-Z0-9.]+)\s*$', str )
-    if match :
-        return match.group( 1 )
+    try:
+        filename = None
+        root_dir = os.environ.get( 'KERNEL_ROOT_DIR', '' ) # KERNEL_ROOT_DIR or "" if not found
+        if root_dir and os.path.exists( root_dir + "/bin/salome/VERSION" ):
+            filename = root_dir + "/bin/salome/VERSION"
+        root_dir = os.environ.get( 'GUI_ROOT_DIR', '' )    # GUI_ROOT_DIR "" if not found
+        if root_dir and os.path.exists( root_dir + "/bin/salome/VERSION" ):
+            filename = root_dir + "/bin/salome/VERSION"
+        if filename:
+            str = open( filename, "r" ).readline() # str = "THIS IS SALOME - SALOMEGUI VERSION: 3.0.0"
+            match = re.search( r':\s+([a-zA-Z0-9.]+)\s*$', str )
+            if match :
+                return match.group( 1 )
+    except:
+        pass
     return ''
 
 # calculate and return configuration file id in order to unically identify it
@@ -91,11 +100,12 @@ def version_id( fname ):
     ver = major
     ver = ver * 100 + minor
     ver = ver * 100 + release
-    ver = ver * 10000 + dev
+    ver = ver * 10000
+    if dev > 0: ver = ver - 10000 + dev
     return ver
 
 # get user configuration file name
-def userFile():    
+def userFile():
     v = version()
     if not v:
         return ""        # not unknown version
@@ -120,11 +130,11 @@ def userFile():
     last_version = 0
     for file in f2v:
         ver = version_id( f2v[file] )
-        if abs(last_version-id0) > abs(ver-id0):
+        if ver and abs(last_version-id0) > abs(ver-id0):
             last_version = ver
             last_file = file
     return last_file
-        
+
 # -----------------------------------------------------------------------------
 
 ### xml reader for launch configuration file usage
@@ -133,7 +143,7 @@ section_to_skip = ""
 
 class xml_parser:
     def __init__(self, fileName, _opts ):
-        print "Configure parser: processing %s ..." % fileName 
+        print "Configure parser: processing %s ..." % fileName
         self.space = []
         self.opts = _opts
         self.section = section_to_skip
@@ -232,25 +242,21 @@ class xml_parser:
 
 config_var = appname+'Config'
 # set resources variables if not yet set
-if os.getenv("GUI_ROOT_DIR"):
-    if not os.getenv("SUITRoot"):
-        os.environ["SUITRoot"] = os.getenv("GUI_ROOT_DIR") + "/share/salome"
-    if not os.getenv(config_var):
-        os.environ[config_var] = os.getenv("GUI_ROOT_DIR") + "/share/salome/resources"
-    pass
-else :
-    if not os.getenv("SUITRoot"):
-        os.environ["SUITRoot"] = ""
-    if not os.getenv(config_var):
-        os.environ[config_var] = ""
-
-dirs = os.environ[config_var]
-#abd error om win32 path like W:\dir\di1
-#print 'Search configuration file in dir ', dirs
-if os.sys.platform == 'win32':
-    dirs = re.split('[;]', dirs )
-else:
-    dirs = re.split('[;|:]', dirs )
+dirs = []
+separator = '[;|:]'
+if os.getenv(config_var):
+    if os.sys.platform == 'win32':
+        separator = '[;]'
+    dirs += re.split( separator, os.getenv(config_var))
+    if os.getenv("GUI_ROOT_DIR") and os.path.exists( os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui" ):
+        dirs += [os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"]
+
+separator = ":"
+if sys.platform == 'win32':
+    separator = ';'
+    
+os.environ[config_var] = separator.join(dirs)
+
 dirs.reverse() # reverse order, like in "path" variable - FILO-style processing
 
 _opts = {} # assiciative array of options to be filled
@@ -270,7 +276,7 @@ for dir in dirs:
 
 # SalomeApprc file in user's catalogue
 filename = userFile()
-if filename and not os.path.exists(filename):
+if not filename or not os.path.exists(filename):
     print "Configure parser: Warning : could not find user configuration file"
 else:
     try:
@@ -285,15 +291,15 @@ args = _opts
 for aKey in listKeys:
     if not args.has_key( aKey ):
         args[aKey]=[]
-        
+
 for aKey in boolKeys:
     if not args.has_key( aKey ):
         args[aKey]=0
-        
+
 if args[file_nam]:
     afile=args[file_nam]
     args[file_nam]=[afile]
-    
+
 args[appname_nam] = appname
 
 ### searching for my port
@@ -339,7 +345,7 @@ def options_parser(line):
     else:
       key = source[i][1]
       pass
-    
+
     result[key] = []
     if key:
       i += 1
@@ -379,8 +385,10 @@ if cmd_opts.has_key("h"):
     --help or -h                  : print this help
     --gui or -g                   : launching with GUI
     --terminal -t                 : launching without gui (to deny --gui)
+    or -t=PythonScript[,...]
+                                  : import of PythonScript(s)
     --logger or -l                : redirect messages in a CORBA collector
-    --file=filename or -f=filename: redirect messages in a log file  
+    --file=filename or -f=filename: redirect messages in a log file
     --xterm or -x                 : execute servers in xterm console (messages appear in xterm windows)
     --modules=module1,module2,... : salome module list (modulen is the name of Salome module to load)
     or -m=module1,module2,...
@@ -398,7 +406,7 @@ if cmd_opts.has_key("h"):
     --interp=n or -i=n            : number of additional xterm to open, with session environment
     -z                            : display splash screen
     -r                            : disable centralized exception handling mechanism
-    
+
     For each Salome module, the environment variable <modulen>_ROOT_DIR must be set.
     The module name (<modulen>) must be uppercase.
     KERNEL_ROOT_DIR is mandatory.
@@ -444,8 +452,14 @@ if not cmd_opts.has_key( "m" ) and os.getenv( "SALOME_MODULES" ):
     pass
 
 # 'terminal' must be processed in the end: to deny any 'gui' options
+args[script_nam] = []
 if 't' in cmd_opts:
     args[gui_nam] = 0
+    args[script_nam] = cmd_opts['t']
+    pass
+
+if args[except_nam] == 1:
+    os.environ["NOT_INTERCEPT_SIGNALS"] = "1"
     pass
 
 # now modify SalomeAppConfig environment variable
@@ -455,8 +469,14 @@ else:
     dirs = re.split('[;|:]', os.environ[config_var] )
 for m in args[modules_nam]:
     if m not in ["KERNEL", "GUI", ""] and os.getenv("%s_ROOT_DIR"%m):
-        dirs.append( os.getenv("%s_ROOT_DIR"%m) +  "/share/salome/resources" )
+        d1 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources/" + m.lower()
+        d2 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources"
+        if os.path.exists( "%s/%s.xml"%(d1, appname) ):
+            dirs.append( d1 )
+        elif os.path.exists( "%s/%s.xml"%(d2, appname) ):
+            dirs.append( d2 )
+separator = ":"
 if os.sys.platform == 'win32':
-  os.environ[config_var] = ";".join(dirs)
-else:
-  os.environ[config_var] = ":".join(dirs)
+    separator = ";"
+
+os.environ[config_var] = separator.join(dirs)
index 5fc722b5731890287fa8c95e8aafb37e9e2cb52b..785c0c6c01f813fbdf8a5f578c13113e12fbe482 100755 (executable)
 # 
 import sys,os,time
 import string
-from nameserver import *
-
 from omniORB import CORBA
 
 # Import the stubs for the Naming service
 import CosNaming
+from runNS import *
+
+# -----------------------------------------------------------------------------
+
+class Server:
+   XTERM="/usr/bin/X11/xterm -iconic -e "
+   CMD=""
+
+   def run(self):
+       commande=self.XTERM+self.CMD
+       print commande
+       if sys.platform != "win32":
+         ier=os.system(commande)
+       if ier:print "Commande failed"
+
+# -----------------------------------------------------------------------------
 
+class NamingServer(Server):
+   XTERM=""
+   USER=os.getenv('USER')
+   if USER is None:
+      USER='anonymous'
+   #os.system("mkdir -m 777 -p /tmp/logs")
+   #LOGDIR="/tmp/logs/" + USER
+   #os.system("mkdir -m 777 -p " + LOGDIR)
+   #CMD="runNS.sh > " + LOGDIR + "/salomeNS.log 2>&1"
+   startOmni()
+   
 
 # -----------------------------------------------------------------------------
 
 class client:
 
-   def __init__(self,args):
+   def __init__(self):
+      #set GIOP message size for bug 10560: impossible to get field values in TUI mode
+      sys.argv.extend(["-ORBgiopMaxMsgSize", "104857600"]) ## = 100 * 1024 * 1024
       # Initialise the ORB
       self.orb=CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
       # Initialise the Naming Service
-      self.initNS(args)
+      self.initNS()
 
    # --------------------------------------------------------------------------
 
-   def initNS(self,args):
+   def initNS(self):
       # Obtain a reference to the root naming context
       obj         = self.orb.resolve_initial_references("NameService")
       try:
@@ -49,7 +76,7 @@ class client:
           print "Lancement du Naming Service",
           
       # On lance le Naming Server (doit etre dans le PATH)
-      ns = NamingServer(args).run()
+      NamingServer().run()
       print "Searching Naming Service ",
       ncount=0
       delta=0.1
@@ -116,7 +143,7 @@ class client:
 
    # --------------------------------------------------------------------------
 
-   def waitNS(self,name,typobj=None,maxcount=1000):
+   def waitNS(self,name,typobj=None,maxcount=60):
       count=0
       delta=0.5
       print "Searching %s in Naming Service " % name,
@@ -139,38 +166,36 @@ class client:
             print "%s exists but is not a %s" % (name,typobj)
       return nobj
 
-   # --------------------------------------------------------------------------
-
    if sys.platform != "win32":
-     def waitNSPID(self, theName, thePID, theTypObj = None):
-        aCount = 0
-        aDelta = 0.5
-        anObj = None
-        print "Searching %s in Naming Service " % theName,
-        while(1):
-           try:
-              aPid, aStatus = os.waitpid(thePID,os.WNOHANG)
-           except Exception, exc:
-              raise "Impossible de trouver %s" % theName
-           aCount += 1
-           anObj = self.Resolve(theName)
-           if anObj: 
-              print " found in %s seconds " % ((aCount-1)*aDelta)
-              break
-           else:
-              sys.stdout.write('+')
-              sys.stdout.flush()
-              time.sleep(aDelta)
-              pass
-           pass
+    def waitNSPID(self, theName, thePID, theTypObj = None):
+      aCount = 0
+      aDelta = 0.5
+      anObj = None
+      print "Searching %s in Naming Service " % theName,
+      while(1):
+         try:
+            aPid, aStatus = os.waitpid(thePID,os.WNOHANG)
+         except Exception, exc:
+            raise "Impossible de trouver %s" % theName
+         aCount += 1
+         anObj = self.Resolve(theName)
+         if anObj: 
+            print " found in %s seconds " % ((aCount-1)*aDelta)
+            break
+         else:
+            sys.stdout.write('+')
+            sys.stdout.flush()
+            time.sleep(aDelta)
+            pass
+         pass
       
-        if theTypObj is None:
-           return anObj
+      if theTypObj is None:
+         return anObj
 
-        anObject = anObj._narrow(theTypObj)
-        if anObject is None:
-           print "%s exists but is not a %s" % (theName,theTypObj)
-        return anObject
+      anObject = anObj._narrow(theTypObj)
+      if anObject is None:
+         print "%s exists but is not a %s" % (theName,theTypObj)
+      return anObject
 
 
    # --------------------------------------------------------------------------
index 1059aa1b1ea86b607e7941cefd0313b0b2e0cfab..ff25c6321903aeedcebe59e7eebd615d2290024d 100755 (executable)
@@ -2,7 +2,7 @@
 
 #log files localization
 
-import os, commands, sys, re
+import os, commands, sys, re, string, socket
 from Utils_Identity import getShortHostName
 
 if sys.platform == "win32":
@@ -45,7 +45,10 @@ def startOmni():
 
        print "Name Service... "
        #hname=os.environ["HOST"] #commands.getoutput("hostname")
-        hname=getShortHostName()
+       if sys.platform == "win32":
+          hname=getShortHostName()
+       else:
+         hname=socket.gethostname()
 
        print "hname=",hname
        
@@ -58,10 +61,15 @@ def startOmni():
        #aSedCommand="s/.*NameService=corbaname::" + hname + ":\([[:digit:]]*\)/\1/"
        #print "sed command = ", aSedCommand
        #aPort = commands.getoutput("sed -e\"" + aSedCommand + "\"" + os.environ["OMNIORB_CONFIG"])
+        global process_id
        print "port=", aPort
-       if sys.platform == "win32":
-         print "start omniNames -start " + aPort + " -logdir " + upath
-         os.system("start omniNames -start " + aPort + " -logdir " + upath)
+       if sys.platform == "win32":          
+          #import win32pm
+          #command = ['omniNames -start ' , aPort , ' -logdir ' , '\"' + upath + '\"']
+          os.system("start omniNames -start " + aPort + " -logdir " + "\"" + upath + "\"" )
+          #print command
+          #pid = win32pm.spawnpid( string.join(command, " ") )
+          #process_id[pid]=command
        else:
          os.system("omniNames -start " + aPort + " -logdir " + upath + " &")
 
index 7473fab534840c555db53649bab57dfc21fd0fbe..c8731e95ce2ea41666b42a3dbe663f16989cab11 100755 (executable)
 # 
 
 import sys, os, string, glob, time, pickle
-from server import *
 import orbmodule
 import setenv
 
+process_id = {}
+
 # -----------------------------------------------------------------------------
 
 from killSalome import killAllPorts
@@ -69,6 +70,44 @@ def kill_salome(args):
         killAllPorts()
     elif args['portkill']:
         givenPortKill(str(args['port']))
+
+# -----------------------------------------------------------------------------
+#
+# Definition des classes d'objets pour le lancement des Server CORBA
+#
+
+class Server:
+    """Generic class for CORBA server launch"""
+
+    def initArgs(self):
+        self.PID=None
+        self.CMD=[]
+        self.ARGS=[]   
+        if self.args['xterm']:
+            self.ARGS=['xterm', '-iconic', '-sb', '-sl', '500', '-hold']
+
+    def __init__(self,args):
+        self.args=args
+        self.initArgs()
+
+
+    def run(self):
+        global process_id
+        myargs=self.ARGS
+        if self.args['xterm']:
+            # (Debian) send LD_LIBRARY_PATH to children shells (xterm)
+            env_ld_library_path=['env', 'LD_LIBRARY_PATH='
+                                 + os.getenv("LD_LIBRARY_PATH")]
+            myargs = myargs +['-T']+self.CMD[:1]+['-e'] + env_ld_library_path
+        command = myargs + self.CMD
+        print "SERVER::command = ", command
+       if sys.platform == "win32":
+         import win32pm
+          pid = win32pm.spawnpid( string.join(command, " "),'-nc' )
+       else:
+          pid = os.spawnvp(os.P_NOWAIT, command[0], command)
+        process_id[pid]=self.CMD
+        self.PID = pid
        
 
 class InterpServer(Server):
@@ -81,7 +120,7 @@ class InterpServer(Server):
     def run(self):
         global process_id
         command = self.CMD
-        print "command = ", command
+        print "INTERPSERVER::command = ", command
        if sys.platform == "win32":
           import win32pm
           pid = win32pm.spawnpid( string.join(command, " "),'-nc' )
@@ -118,10 +157,21 @@ class CatalogServer(Server):
                 module_root_dir=modules_root_dir[module]
                 module_cata=module+"Catalog.xml"
                 #print "   ", module_cata
-                cata_path.extend(
-                    glob.glob(os.path.join(module_root_dir,
-                                           "share",setenv.salome_subdir,
-                                           "resources",module_cata)))
+                if os.path.exists(os.path.join(module_root_dir,
+                                               "share",setenv.salome_subdir,
+                                               "resources",module.lower(),
+                                               module_cata)):
+                    cata_path.extend(
+                        glob.glob(os.path.join(module_root_dir,
+                                               "share",setenv.salome_subdir,
+                                               "resources",module.lower(),
+                                               module_cata)))
+                else:
+                    cata_path.extend(
+                        glob.glob(os.path.join(module_root_dir,
+                                               "share",setenv.salome_subdir,
+                                               "resources",
+                                               module_cata)))
                 pass
             pass
         self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
@@ -132,9 +182,6 @@ class SalomeDSServer(Server):
     def __init__(self,args):
         self.args=args
         self.initArgs()
-#      if sys.platform == "win32":
-#          self.CMD=[os.environ["KERNEL_ROOT_DIR"] + "/win32/" + os.environ["BIN_ENV"] + "/" + 'SALOMEDS_Server' + ".exe"]
-#      else:
         self.CMD=['SALOMEDS_Server']
 
 # ---
@@ -143,9 +190,6 @@ class RegistryServer(Server):
     def __init__(self,args):
         self.args=args
         self.initArgs()
-#      if sys.platform == "win32":
-#          self.CMD=[os.environ["KERNEL_ROOT_DIR"] + "/win32/" + os.environ["BIN_ENV"] + "/" + 'SALOME_Registry_Server'+ ".exe", '--salome_session','theSession']
-#      else:
         self.CMD=['SALOME_Registry_Server', '--salome_session','theSession']
 
 # ---
@@ -154,9 +198,6 @@ class ContainerCPPServer(Server):
     def __init__(self,args):
         self.args=args
         self.initArgs()
-#      if sys.platform == "win32":
-#          self.CMD=[os.environ["KERNEL_ROOT_DIR"] + "/win32/" + os.environ["BIN_ENV"] + "/" + 'SALOME_Container' + ".exe",'FactoryServer']
-#      else:
         self.CMD=['SALOME_Container','FactoryServer']
 
 # ---
@@ -201,9 +242,6 @@ class SessionServer(Server):
         self.args['xterm']=0
         #
         self.initArgs()
-#      if sys.platform == "win32":
-#          self.SCMD1=[os.environ["GUI_ROOT_DIR"] + "/win32/" + os.environ["BIN_ENV"] + "/" + 'SALOME_Session_Server' + ".exe"]
-#      else:
         self.SCMD1=['SALOME_Session_Server']
        
         self.SCMD2=[]
@@ -253,12 +291,22 @@ class SessionServer(Server):
             module_root_dir=modules_root_dir[module]
             module_cata=module+"Catalog.xml"
             #print "   ", module_cata
-            cata_path.extend(
-                glob.glob(os.path.join(module_root_dir,"share",
-                                       setenv.salome_subdir,"resources",
-                                       module_cata)))
+            if os.path.exists(os.path.join(module_root_dir,
+                                           "share",setenv.salome_subdir,
+                                           "resources",module.lower(),
+                                           module_cata)):
+                cata_path.extend(
+                    glob.glob(os.path.join(module_root_dir,"share",
+                                           setenv.salome_subdir,"resources",
+                                           module.lower(),module_cata)))
+            else:
+                cata_path.extend(
+                    glob.glob(os.path.join(module_root_dir,"share",
+                                           setenv.salome_subdir,"resources",
+                                           module_cata)))
+            pass
         if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']):
-#            self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2
+            #Use '::' instead ":" because drive path with "D:\" is invalid on windows platform
             self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
         else:
             self.CMD=self.SCMD1 + self.SCMD2
@@ -269,9 +317,6 @@ class ContainerManagerServer(Server):
     def __init__(self,args):
         self.args=args
         self.initArgs()
-#      if sys.platform == "win32":
-#          self.SCMD1=[os.environ["KERNEL_ROOT_DIR"] + "/win32/" + os.environ["BIN_ENV"] + "/" + 'SALOME_ContainerManagerServer' + ".exe"]
-#      else:
         self.SCMD1=['SALOME_ContainerManagerServer']
         self.SCMD2=[]
         if args["gui"] :
@@ -298,10 +343,19 @@ class ContainerManagerServer(Server):
                 module_root_dir=modules_root_dir[module]
                 module_cata=module+"Catalog.xml"
                 #print "   ", module_cata
-                cata_path.extend(
-                    glob.glob(os.path.join(module_root_dir,"share",
-                                           self.args['appname'],"resources",
-                                           module_cata)))
+                if os.path.exists(os.path.join(module_root_dir,
+                                               "share",setenv.salome_subdir,
+                                               "resources",module.lower(),
+                                               module_cata)):
+                    cata_path.extend(
+                        glob.glob(os.path.join(module_root_dir,"share",
+                                               self.args['appname'],"resources",
+                                               module.lower(),module_cata)))
+                else:
+                    cata_path.extend(
+                        glob.glob(os.path.join(module_root_dir,"share",
+                                               self.args['appname'],"resources",
+                                               module_cata)))
                 pass
             pass
         if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']):
@@ -316,7 +370,7 @@ class NotifyServer(Server):
         self.modules_root_dir=modules_root_dir
         myLogName = os.environ["LOGNAME"]
         self.CMD=['notifd','-c',
-                  self.modules_root_dir["KERNEL"] +'/share/salome/resources/channel.cfg',
+                  self.modules_root_dir["KERNEL"] +'/share/salome/resources/kernel/channel.cfg',
                   '-DFactoryIORFileName=/tmp/'+myLogName+'_rdifact.ior',
                   '-DChannelIORFileName=/tmp/'+myLogName+'_rdichan.ior',
                   '-DReportLogFile=/tmp/'+myLogName+'_notifd.report',
@@ -351,7 +405,7 @@ def startSalome(args, modules_list, modules_root_dir):
     # Initialisation ORB et Naming Service
     #
    
-    clt=orbmodule.client(args)
+    clt=orbmodule.client()
 
     # (non obligatoire) Lancement Logger Server
     # et attente de sa disponibilite dans le naming service
@@ -365,10 +419,12 @@ def startSalome(args, modules_list, modules_root_dir):
     # Notify Server launch
     #
 
-#    print "Notify Server to launch"
 
-#    myServer=NotifyServer(args,modules_root_dir)
-#    myServer.run()
+    if sys.platform != "win32":
+      print "Notify Server to launch"
+    
+      myServer=NotifyServer(args,modules_root_dir)
+      myServer.run()
 
     # Lancement Session Server (to show splash ASAP)
     #
@@ -412,24 +468,7 @@ def startSalome(args, modules_list, modules_root_dir):
     # attente de la disponibilite du SalomeDS dans le Naming Service
     #
 
-    os.environ["CSF_PluginDefaults"] \
-    = os.path.join(modules_root_dir["KERNEL"],"share",
-                   setenv.salome_subdir,"resources")
-    os.environ["CSF_SALOMEDS_ResourcesDefaults"] \
-    = os.path.join(modules_root_dir["KERNEL"],"share",
-                   setenv.salome_subdir,"resources")
-
-    if "GEOM" in modules_list:
-        print "GEOM OCAF Resources"
-        os.environ["CSF_GEOMDS_ResourcesDefaults"] \
-        = os.path.join(modules_root_dir["GEOM"],"share",
-                       setenv.salome_subdir,"resources")
-       print "GEOM Shape Healing Resources"
-        os.environ["CSF_ShHealingDefaults"] \
-        = os.path.join(modules_root_dir["GEOM"],"share",
-                       setenv.salome_subdir,"resources")
-
-    print "ARGS = ",args
+    #print "ARGS = ",args
     if ('study' not in args['embedded']) | (args["gui"] == 0):
         print "RunStudy"
         myServer=SalomeDSServer(args)
@@ -451,10 +490,10 @@ def startSalome(args, modules_list, modules_root_dir):
     from Utils_Identity import getShortHostName
     
     if os.getenv("HOSTNAME") == None:
-        #if os.getenv("HOST") == None:
+        if os.getenv("HOST") == None:
             os.environ["HOSTNAME"]=getShortHostName()
-        #else:
-        #    os.environ["HOSTNAME"]=os.getenv("HOST")
+        else:
+            os.environ["HOSTNAME"]=os.getenv("HOST")
 
     theComputer = getShortHostName()
     
@@ -517,7 +556,6 @@ def startSalome(args, modules_list, modules_root_dir):
           session=clt.waitNS("/Kernel/Session",SALOME.Session)
         else:
           session=clt.waitNSPID("/Kernel/Session",mySessionServ.PID,SALOME.Session)
-
     end_time = os.times()
     print
     print "Start SALOME, elapsed time : %5.1f seconds"% (end_time[4]
@@ -613,6 +651,19 @@ def useSalome(args, modules_list, modules_root_dir):
         print " --- registered objects tree in Naming Service ---"
         clt.showNS()
 
+        # run python scripts, passed via -t option
+        toimport = args['pyscript']
+        i = 0
+        while i < len( toimport ) :
+            if toimport[ i ] == 'killall':
+                print "killall : option disabled"
+                #killAllPorts()
+            else:
+                print 'importing',toimport[ i ]
+                doimport = 'import ' + toimport[ i ]
+                exec doimport
+                i = i + 1
+
     return clt
 
 # -----------------------------------------------------------------------------
@@ -622,7 +673,12 @@ def registerEnv(args, modules_list, modules_root_dir):
     Register args, modules_list, modules_root_dir in a file
     for further use, when SALOME is launched embedded in an other application.
     """
-    fileEnv = '/tmp/' + os.getenv('USER') + "_" + str(args['port']) \
+    if sys.platform == "win32":
+      fileEnv = os.getenv('TEMP')
+    else:
+      fileEnv = '/tmp/'
+
+    fileEnv += os.getenv('USER') + "_" + str(args['port']) \
             + '_' + args['appname'].upper() + '_env'
     fenv=open(fileEnv,'w')
     pickle.dump((args, modules_list, modules_root_dir),fenv)
index 09f120f5f9839752b3e2d53e4d7f7f89b37b216f..d3606fc77b4b1f7f7678a955d11c37395591d10d 100755 (executable)
@@ -45,6 +45,18 @@ def add_path(directory, variable_name):
         if variable_name == "PYTHONPATH":
             sys.path[:0] = [directory]
 
+# -----------------------------------------------------------------------------
+__lib__dir__ = None
+def get_lib_dir():
+    global __lib__dir__
+    if __lib__dir__: return __lib__dir__
+    import platform
+    if platform.architecture()[0] == "64bit":
+        __lib__dir__ = "lib64"
+    else:
+        __lib__dir__ = "lib"
+    return get_lib_dir()
+
 # -----------------------------------------------------------------------------
 
 def get_config():
@@ -171,7 +183,7 @@ def set_env(args, modules_list, modules_root_dir):
         os.environ["SMESH_MeshersList"]="StdMeshers"
         if not os.environ.has_key("SALOME_StdMeshersResources"):
             os.environ["SALOME_StdMeshersResources"] \
-            = modules_root_dir["SMESH"]+"/share/"+args["appname"]+"/resources"
+            = modules_root_dir["SMESH"]+"/share/"+args["appname"]+"/resources/smesh"
             pass
         if args.has_key("SMESH_plugins"):
             for plugin in args["SMESH_plugins"]:
@@ -189,19 +201,19 @@ def set_env(args, modules_list, modules_root_dir):
                     = os.environ["SMESH_MeshersList"]+":"+plugin
                     if not os.environ.has_key("SALOME_"+plugin+"Resources"):
                         os.environ["SALOME_"+plugin+"Resources"] \
-                        = plugin_root+"/share/"+args["appname"]+"/resources"
-                    add_path(os.path.join(plugin_root,"lib",python_version,
+                        = plugin_root+"/share/"+args["appname"]+"/resources/"+plugin.lower()
+                    add_path(os.path.join(plugin_root,get_lib_dir(),python_version,
                                           "site-packages",salome_subdir),
                              "PYTHONPATH")
-                    add_path(os.path.join(plugin_root,"lib",salome_subdir),
+                    add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir),
                              "PYTHONPATH")
 
 
                    if sys.platform == "win32":
-                     add_path(os.path.join(plugin_root,"lib",salome_subdir),
+                     add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir),
                                "PATH")
                     else:
-                      add_path(os.path.join(plugin_root,"lib",salome_subdir),
+                      add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir),
                                "LD_LIBRARY_PATH")
                     add_path(os.path.join(plugin_root,"bin",salome_subdir),
                              "PYTHONPATH")
@@ -223,20 +235,20 @@ def set_env(args, modules_list, modules_root_dir):
     if not os.getenv("CSF_PluginDefaults"):
         os.environ["CSF_PluginDefaults"] \
         = os.path.join(modules_root_dir["KERNEL"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","kernel")
     os.environ["CSF_SALOMEDS_ResourcesDefaults"] \
     = os.path.join(modules_root_dir["KERNEL"],"share",
-                   salome_subdir,"resources")
+                   salome_subdir,"resources","kernel")
 
     if "GEOM" in modules_list:
         print "GEOM OCAF Resources"
         os.environ["CSF_GEOMDS_ResourcesDefaults"] \
         = os.path.join(modules_root_dir["GEOM"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","geom")
        print "GEOM Shape Healing Resources"
         os.environ["CSF_ShHealingDefaults"] \
         = os.path.join(modules_root_dir["GEOM"],"share",
-                       salome_subdir,"resources")
+                       salome_subdir,"resources","geom")
 
 # -----------------------------------------------------------------------------
 
index edbfbe19383a9f7430c545e1a53921d3ea3c9a12..a8692b71094668b35e75835d23c16107547de862 100644 (file)
@@ -30,6 +30,8 @@ install module KERNEL in the current directory
 import sys, os, optparse, shutil,glob,fnmatch
 py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1])
 
+# -----------------------------------------------------------------------------
+
 def mkdir(path):
     """Create a directory and all the intermediate directories if path does not exist"""
     if not os.path.exists(path):
@@ -41,6 +43,8 @@ def mkdir(path):
             pass
         pass
 
+# -----------------------------------------------------------------------------
+
 def symlink(src, dest):
     """Create a link if it does not exist"""
     if not os.path.exists(dest):
@@ -53,6 +57,8 @@ def symlink(src, dest):
         pass
     pass
 
+# -----------------------------------------------------------------------------
+
 def rmtree(dir):
     """Remove (recursive) a directory if it exists"""
     if os.path.exists(dir):
@@ -65,26 +71,22 @@ def rmtree(dir):
         pass
     pass
 
-def main():
-    usage="""usage: %prog [options]
-Typical use is:
-  python virtual_salome.py -v --prefix="." --module=/local/chris/SALOME2/RELEASES/Install/KERNEL_V3_1_0b1
-"""
-    parser = optparse.OptionParser(usage=usage)
-
-    parser.add_option('-v', '--verbose', action='count', dest='verbose',
-                      default=0, help="Increase verbosity")
-
-    parser.add_option('--prefix', dest="prefix", default='.',
-                      help="The base directory to install to (default .)")
+# -----------------------------------------------------------------------------
 
-    parser.add_option('--module', dest="module", 
-                      help="The module directory to install in (mandatory)")
+__lib__dir__ = None
+def get_lib_dir():
+    global __lib__dir__
+    if __lib__dir__: return __lib__dir__
+    import platform
+    if platform.architecture()[0] == "64bit":
+        __lib__dir__ = "lib64"
+    else:
+        __lib__dir__ = "lib"
+    return get_lib_dir()
 
-    parser.add_option('--clear', dest='clear', action='store_true',
-        help="Clear out the install and start from scratch")
+# -----------------------------------------------------------------------------
 
-    options, args = parser.parse_args()
+def link_module(options):
     global verbose
 
     if not options.module:
@@ -98,16 +100,16 @@ Typical use is:
 
     home_dir = os.path.expanduser(options.prefix)
 
-    #module_dir="/local/chris/SALOME2/RELEASES/Install/KERNEL_V3_1_0b1"
     module_bin_dir=os.path.join(module_dir,'bin','salome')
-    module_lib_dir=os.path.join(module_dir,'lib','salome')
-    module_lib_py_dir=os.path.join(module_dir,'lib',py_version,'site-packages','salome')
-    module_lib_py_shared_dir=os.path.join(module_dir,'lib',py_version,
+    module_lib_dir=os.path.join(module_dir,get_lib_dir(),'salome')
+    module_lib_py_dir=os.path.join(module_dir,get_lib_dir(),py_version,'site-packages','salome')
+    module_lib_py_shared_dir=os.path.join(module_dir,get_lib_dir(),py_version,
                                           'site-packages','salome','shared_modules')
     module_share_dir=os.path.join(module_dir,'share','salome','resources')
     module_doc_gui_dir=os.path.join(module_dir,'doc','salome','gui')
     module_doc_tui_dir=os.path.join(module_dir,'doc','salome','tui')
     module_doc_dir=os.path.join(module_dir,'doc','salome')
+    module_sharedoc_dir=os.path.join(module_dir,'share','doc','salome')
 
     if not os.path.exists(module_lib_py_dir):
         print "Python directory %s does not exist" % module_lib_py_dir
@@ -122,39 +124,49 @@ Typical use is:
     doc_gui_dir=os.path.join(home_dir,'doc','salome','gui')
     doc_tui_dir=os.path.join(home_dir,'doc','salome','tui')
     doc_dir=os.path.join(home_dir,'doc','salome')
+    sharedoc_dir=os.path.join(home_dir,'share','doc','salome')
 
     verbose = options.verbose
 
     if options.clear:
         rmtree(bin_dir)
         rmtree(lib_dir)
+        rmtree(lib_py_dir)
         rmtree(share_dir)
         rmtree(doc_dir)
+        rmtree(sharedoc_dir)
         pass
     
     #directory bin/salome : create it and link content
-    mkdir(bin_dir)
-    for fn in os.listdir(module_bin_dir):
-        # if os.path.splitext(fn)[1] not in (".pyc",".pyo"): #Compiled python are excluded
-        symlink(os.path.join(module_bin_dir, fn), os.path.join(bin_dir, fn))
+    if os.path.exists(module_bin_dir):
+        mkdir(bin_dir)
+        for fn in os.listdir(module_bin_dir):
+            symlink(os.path.join(module_bin_dir, fn), os.path.join(bin_dir, fn))
+            pass
         pass
+    else:
+        print module_bin_dir, " doesn't exist"
+        pass    
     
     #directory lib/salome : create it and link content
-    mkdir(lib_dir)
-    for fn in os.listdir(module_lib_dir):
-        symlink(os.path.join(module_lib_dir, fn), os.path.join(lib_dir, fn))
-
+    if os.path.exists(module_lib_dir):
+        mkdir(lib_dir)
+        for fn in os.listdir(module_lib_dir):
+            symlink(os.path.join(module_lib_dir, fn), os.path.join(lib_dir, fn))
+            pass
+        pass
+    else:
+        print module_lib_dir, " doesn't exist"
+        pass    
+    
     #directory lib/py_version/site-packages/salome : create it and link content
     mkdir(lib_py_shared_dir)
     for fn in os.listdir(module_lib_py_dir):
-        # if os.path.splitext(fn)[1] not in (".pyc",".pyo"): #Compiled python are excluded
-        if os.path.split(fn)[1] != "shared_modules":
-            symlink(os.path.join(module_lib_py_dir, fn), os.path.join(lib_py_dir, fn))
-            pass
-        pass
+        if fn == "shared_modules": continue
+        symlink(os.path.join(module_lib_py_dir, fn), os.path.join(lib_py_dir, fn))
+        pass    
     if os.path.exists(module_lib_py_shared_dir):
         for fn in os.listdir(module_lib_py_shared_dir):
-            # if os.path.splitext(fn)[1] not in (".pyc",".pyo"): #Compiled python are excluded
             symlink(os.path.join(module_lib_py_shared_dir, fn), os.path.join(lib_py_shared_dir, fn))
             pass
         pass
@@ -162,6 +174,15 @@ Typical use is:
         print module_lib_py_shared_dir, " doesn't exist"
         pass    
 
+    #directory share/doc/salome (KERNEL doc) : create it and link content
+    if os.path.exists(module_sharedoc_dir):
+        mkdir(sharedoc_dir)
+        for fn in os.listdir(module_sharedoc_dir):
+            symlink(os.path.join(module_sharedoc_dir, fn), os.path.join(sharedoc_dir, fn))
+            pass
+        pass
+    pass
+
 
     #directory share/salome/resources : create it and link content
     mkdir(share_dir)
@@ -193,7 +214,34 @@ Typical use is:
             symlink(os.path.join(module_doc_tui_dir, fn), os.path.join(doc_tui_dir, fn))
             pass
         pass
+
+# -----------------------------------------------------------------------------
+
+def main():
+    usage="""usage: %prog [options]
+Typical use is:
+  python virtual_salome.py -v --prefix="." --module=/local/chris/SALOME2/RELEASES/Install/KERNEL_V3_1_0b1
+"""
+    parser = optparse.OptionParser(usage=usage)
+
+    parser.add_option('-v', '--verbose', action='count', dest='verbose',
+                      default=0, help="Increase verbosity")
+
+    parser.add_option('--prefix', dest="prefix", default='.',
+                      help="The base directory to install to (default .)")
+
+    parser.add_option('--module', dest="module", 
+                      help="The module directory to install in (mandatory)")
+
+    parser.add_option('--clear', dest='clear', action='store_true',
+        help="Clear out the install and start from scratch")
+
+    options, args = parser.parse_args()
+    link_module(options)
+    pass
     
+# -----------------------------------------------------------------------------
+
 if __name__ == '__main__':
     main()
     pass
index 0161290f100f119d381a91c1a0eddd3a29512645..1a623565e8fc6d4b91eaf2105d1640c8460649e2 100644 (file)
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.2.0], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.2], [gboulant@CS], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -18,11 +18,15 @@ AM_INIT_AUTOMAKE
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
-XVERSION=0x030200
+VERSION=3.2.2
+XVERSION=0x030202
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=kernel
+AC_SUBST(MODULE_NAME)
+
 echo
 echo ---------------------------------------------
 echo Initialize source and build root directories
index f7cc1d863fea7539c435112e516db84df5d76b51..7c01e348cc435f5c2d994bd8203939399f4339fc 100644 (file)
@@ -6,8 +6,8 @@ Installation instructions, up to date for 3.0 version
 
   rst2html < doc.txt > doc.html
 
-*This document corresponds to SALOME2 3.1.0*
-*NOT UP TO DATE with 3.2.0*
+*This document corresponds to SALOME2 2.2.9.*
+*IT IS NOT UP TO DATE with 3.2.0*
 
 .. contents::
 .. sectnum::
@@ -109,7 +109,6 @@ current version depends on the following list
 (versions given here are from Debian Sarge, except OpenCascade, VTK and MED,
 which are not Debian packages):
 
-===================     ===================================================
 CAS-5.2.4              OpenCascade (try binaries,a source patch is needed)
 VTK-4.2.6              VTK 3D-viewer
 PyQt-3.13              Python-Qt Wrapper
@@ -122,24 +121,19 @@ omniORB-4.0.5             ORB used in SALOME
 qt-x11-free-3.3.3      Qt library
 qwt-4.2                        Graph components for Qt
 sip4-4.1.1             langage binding software 
-===================     ===================================================
 
 And, in order to build the documentation:
 
-===================     ===================================================
 doxygen-1.4.2
 graphviz-2.2.1
-===================     ===================================================
 
 
 Additionnal software may be installed for optional features: 
 
-===================     ===================================================
 netgen4.3 + patch
 tix8.1.4
 openpbs-2.3.16
 lsf-???
-===================     ===================================================
 
 
 
diff --git a/doc/README.cluster-CCRT b/doc/README.cluster-CCRT
new file mode 100644 (file)
index 0000000..1c93650
--- /dev/null
@@ -0,0 +1,63 @@
+
+OverView
+========
+
+That describes how to start Salome without IHM in "terminal" mode.
+
+With that "terminal" mode Salome may be started in "Batch" mode.
+
+And one or more python scripts may be executed
+
+Warnings
+========
+
+The list of needed modules must be explicited with --modules option
+
+It is not possible to use embbedded components, so we must use --standalone option
+
+After the python script(s) listed in the --terminal option, ",killall" should
+be added : so the processes of Salome will be killed after the execution of
+the python script(s).
+
+
+Examples
+========
+
+Sans IHM sans execution de script python (for interactive testing and developping) :
+---------------------------------------------
+
+runSalome --terminal --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+
+Sans IHM avec execution de script(s) python :
+---------------------------------------------
+
+runSalome --terminal=CALCULATOR_TEST --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+
+runSalome --terminal=CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM,CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall --logger
+after the import of CALCULATOR_TEST, killall will be executed.
+
+
+===================================================
+Example for starting Salome in Batch mode on CCRT :
+===================================================
+
+Create a shell file "runSalome.batch" with for example :
+--------------------------------------------------------
+#BSUB -n 10
+#BSUB -o runSalome.log%J
+#BSUB -c 0:10
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer,pyContainer --killall
+exit
+
+Queue for execution that file (here runSalome.batch) :
+--------------------------------------------------------------------
+bsub < runSalome.batch
+
+See the "bsub" documentation for details (or "man bsub")
+
index 736f50add05d8408df233e8af5ef077c9be6846e..188fa8419395fa88362fdbfbfedf8d21cb19b860 100644 (file)
@@ -74,19 +74,29 @@ configure his own application. These files are described after, the list is:
 - CatalogResources.xml
 - SalomeApp.xml
 
-Second way - one single virtual install directory
-'''''''''''''''''''''''''''''''''''''''''''''''''
-
-The user must create an application directory in which he copies
-appli_install.sh, appli_clean.sh and virtual_salome.py,
-from ${KERNEL_ROOT_DIR}/bin/salome.
-
-appli_install.sh needs to be edited, to define a list of modules with their
-install paths.
-Then, the script appli_install.sh creates a virtual installation of SALOME
-in the application directory (bin, lib, doc, share...), with,
-for each file (executable, script, data,library, resources...),
-symbolic links to the actual file.
+Second and easiest way - one single virtual install directory
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The user must create a SALOME application configuration file by modifying a
+copy of ${KERNEL_ROOT_DIR}/bin/salome/config_appli.xml.
+The file describes the list of SALOME modules used in the application, with
+their respective installation path. The configuration file also defines the
+path of an existing script which sets the SALOME prerequisites,
+and optionnaly, the path of samples directory (SAMPLES_SRC).
+The following command::
+
+    python <KERNEL_ROOT_DIR>/bin/salome/appli_gen.py --prefix=<install directory> --config=<configuration file>
+
+creates a virtual installation of SALOME in the application directory ${APPLI}
+(bin, lib, doc, share...), with, for each file (executable, script, data,
+library, resources...), symbolic links to the actual file.
+
+Providing an existing an existing script for SALOME prerequisites (the same one
+used for modules compilation, or given with the modules installation), the
+installation works without further modification for a single computer (unless
+some modules needs a special environment not defined in the above script).
+For a distributed application (several computers), one must copy and adapt
+CatalogResources.xml from ${KERNEL_ROOT_DIR}/bin/salome/appliskel (see below).
 
 General rules
 -------------
@@ -108,15 +118,12 @@ script is used by run scripts.
 
 env.d scripts
 ~~~~~~~~~~~~~
+With the first way of installation, each user **must define** his own
+configuration for these scripts, following the above rules.
+With the virtual installation (second way, above), env.d
+scripts are built automatically.
 
-Each user **must define** his own configuration for these scripts, following
-the above rules. With the virtual installation (second way, above), env.d
-scripts are built by appli_install.sh (given it's parameters). Otherwise, the
-scripts must be manually defined.
-
-
- **The following is only an example proposed by createAppli.sh,
- not working as it is**.
+ **The following is only an example proposed by createAppli.sh, (first way of installation) not working as it is**.
 
 atFirst.sh
     Sets the computer configuration not directly related to SALOME,
@@ -180,11 +187,12 @@ Other configuration files
 
 SalomeApp.xml
    This file is similar to the default given
-   in ${GUI_ROOT_DIR}/share/salome/resources
+   in ${GUI_ROOT_DIR}/share/salome/resources/gui
+
 
 
 CatalogRessources.xml
-   This files describes all the computer the application can use. The given
+   This files describes all the computers the application can use. The given
    example is minimal and suppose ${APPLI} is the same relative path
    to ${HOME}, on all the computers. A different directory can be set on a
    particular computer with a line::
index 1d4cd7009d7f8a8b4508607e97b6fa4661981c6b..993af3090d02fc4b1658cbff910d73dd7eb7977e 100644 (file)
@@ -25,7 +25,7 @@
 
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-EXTRA_DIST = $(srcdir)/KERNEL
+EXTRA_DIST = KERNEL pythfilter.py
 
 dist-hook:
        rm -rf `find $(distdir) -name CVS`
@@ -54,6 +54,7 @@ usr_docs:
        cp -fr $(srcdir)/KERNEL/sources/ $(docdir)/tui/KERNEL;
        cp -fr $(srcdir)/KERNEL/HTML/ $(docdir)/tui/KERNEL;
        cp -f $(srcdir)/pythfilter.py $(docdir)/tui/KERNEL;
+       cp -fr $(srcdir)/KERNEL/exemple/ $(docdir)/tui/KERNEL;
 
 dev_docs:
        cp -fr $(srcdir)/KERNEL/* ./INPUT; \
index f9a81011e18cc7d2832e537f7ceddba986bef8a3..dc4312bfee858172ec02ad9c1c382261fdf23e9a 100644 (file)
@@ -1,4 +1,4 @@
-@set UPDATED 31 May 2006
-@set UPDATED-MONTH May 2006
-@set EDITION 3.2.0
-@set VERSION 3.2.0
+@set UPDATED 14 June 2006
+@set UPDATED-MONTH June 2006
+@set EDITION 3.2.2
+@set VERSION 3.2.2
index 52f4e102295353a8c8a8100a9a3bfb75d6f69ced..c82d3f331de5d753c857abb91f2bd2a82e1fd8fe 100644 (file)
@@ -173,7 +173,7 @@ during each working session.
    \param aComponentName    It's a string value in the Comment Attribute of the Component,
     which is looked for, defining the data type of this Component.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     SComponent FindComponent  (in string aComponentName);
 /*!
@@ -186,7 +186,7 @@ during each working session.
     \param anObjectName String parameter defining the name of the object
     \return The obtained %SObject
 
-<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example19.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     SObject       FindObject      (in string anObjectName);
@@ -234,14 +234,14 @@ during each working session.
     Sets the context of the %Study.
     \param thePath String parameter defining the context of the study.
 
-<BR><VAR>See also <A href=exemple/Example23.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example23.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void SetContext(in string thePath);
 /*!
     Gets the context of the %Study.
     
-<BR><VAR>See also <A href=exemple/Example23.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example23.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     string GetContext();
@@ -283,7 +283,7 @@ during each working session.
 
    \return A new %StudyBuilder.
 
-<BR><VAR>See also <A href=exemple/Example20.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example20.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     StudyBuilder NewBuilder() ;
@@ -297,7 +297,7 @@ during each working session.
 
    Returns the attriubte, which contains the properties of this study.
 
-<BR><VAR>See also <A href=exemple/Example20.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example20.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     AttributeStudyProperties GetProperties();
@@ -402,6 +402,30 @@ during each working session.
 */
     long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal);
 
+
+/*!
+    Marks this Study as being locked by the given locker. The lock status can be checked by method IsStudyLocked
+    \param theLockerID identifies a locker of the study can be for ex. IOR of the engine that locks the study.
+*/
+    void SetStudyLock(in string theLockerID);
+
+/*!
+    Returns True if the Study was marked locked. 
+*/
+    boolean IsStudyLocked();
+
+/*!
+    Marks this Study as being unlocked by the given locker. The lock status can be checked by method IsStudyLocked
+    \param theLockerID identifies a locker of the study can be for ex. IOR of the engine that unlocks the study.
+*/
+    void UnLockStudy(in string theLockerID);
+
+/*!
+    Returns the list iof IDs of the Study's lockers. 
+*/
+    ListOfStrings GetLockerID();
+
+
   };
 
   //==========================================================================
@@ -429,7 +453,7 @@ during each working session.
    Creates a new %SComponent
    \param ComponentDataType    Data type of the %SComponent which will be created.
 
-<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example17.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     SComponent NewComponent(in string ComponentDataType) raises(LockProtection);
@@ -452,7 +476,7 @@ during each working session.
    \param theFatherObject The father %SObject under which this one should be created.
    \return New %SObject
 
-<BR><VAR>See also <A href=exemple/Example18.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example18.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
 
@@ -485,7 +509,7 @@ during each working session.
 /*!
    Loads a %SComponent.
 
-<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example19.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void  LoadWith (in SComponent sco, in Driver Engine) raises (SALOME::SALOME_Exception);
@@ -502,7 +526,7 @@ during each working session.
     \param anObject        The %SObject corresponding to the attribute which is looked for.
     \param aTypeOfAttribute     Type of the attribute.
 
-  <BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+  <BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
 
     GenericAttribute FindOrCreateAttribute(in  SObject        anObject,
@@ -526,7 +550,7 @@ during each working session.
     \param anObject        The %SObject corresponding to the attribute.
     \param aTypeOfAttribute     Type of the attribute.
 
-<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example17.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void RemoveAttribute(in  SObject        anObject,
                         in  string         aTypeOfAttribute) raises(LockProtection);
@@ -550,7 +574,7 @@ during each working session.
    Adds a directory in the %Study.
    \param theName String parameter defining the name of the directory.
 
-<BR><VAR>See also <A href=exemple/Example23.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example23.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void AddDirectory(in string theName) raises(LockProtection);
@@ -577,7 +601,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
    Creates a new command which can contain several different actions.
    
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void NewCommand(); // command management
@@ -587,7 +611,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
    \exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications.
 
-<BR><VAR>See also <A href=exemple/Example16.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example16.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void CommitCommand() raises(LockProtection); // command management
@@ -599,7 +623,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
     Cancels all actions declared within the command.
     
-<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example17.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void AbortCommand(); // command management
 /*! \brief Undolimit
@@ -613,7 +637,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
     \exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications.
 
-<BR><VAR>See also <A href=exemple/Example16.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example16.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void Undo() raises (LockProtection);
@@ -623,21 +647,21 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
 \exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications.
 
- <BR><VAR>See also <A href=exemple/Example16.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+ <BR><VAR>See also <A href="exemple/Example16.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void Redo() raises (LockProtection);
 /*!
     Returns True if at this moment there are any actions which can be canceled.
     
-   <BR><VAR>See also <A href=exemple/Example16.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+   <BR><VAR>See also <A href="exemple/Example16.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean GetAvailableUndos();
 /*!
     Returns True if at this moment there are any actions which can be redone.
 
-   <BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+   <BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean GetAvailableRedos();
@@ -690,7 +714,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
      \param study_name String parameter defining the name of the study
 
-<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example17.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     Study NewStudy(in string study_name);
@@ -701,7 +725,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
      \param aStudyUrl The path to the study
     \warning This method doesn't activate the corba objects. Only a component can do it.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     Study Open (in URL aStudyUrl) raises (SALOME::SALOME_Exception);
 
@@ -716,7 +740,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
 
     \param theMultiFile If this parameter is True the study will be saved in several files.
 
-<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example19.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean  Save(in  Study aStudy, in boolean theMultiFile);
@@ -733,7 +757,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin
     \param aStudy The study which will be saved
     \param theMultiFile If this parameter is True the study will be saved in several files.
 
- <BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+ <BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     boolean  SaveAs(in URL   aUrl, // if the file already exists
                in Study aStudy,
@@ -880,7 +904,7 @@ Gets the list of open studies
    \param aTypeOfAttribute String value defining the type of the required attribute of the given %SObject.
    \return True if it finds an attribute of a definite type of the given %SObject as well as the discovered attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     boolean FindAttribute(out GenericAttribute anAttribute,
                                  in  string         aTypeOfAttribute);
@@ -894,7 +918,7 @@ Gets the list of open studies
 
     \return The list of all attributes of the given %SObject.
 
-<BR><VAR>See also <A href=exemple/Example17.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example17.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     ListOfAttributes     GetAllAttributes();
@@ -1026,7 +1050,7 @@ Moves the iterator to the next %SComponent in the list.
 /*!
     Returns the %SComponent corresponding to the current %SComponent found by the iterator.
 
- <BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+ <BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     SComponent Value();
@@ -1189,7 +1213,7 @@ can be called by any component and which provide the following functionality:
        \param isMultiFile  If the value of this boolean parameter is True, the data will be saved in several files.
        \return A byte stream TMPFile that contains all saved data
 
-<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example19.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
      */
 
@@ -1204,7 +1228,7 @@ can be called by any component and which provide the following functionality:
        \param isMultiFile  If the value of this boolean parameter is True, the data will be saved in several files.
        \return A byte stream TMPFile that will contain all saved data
 
-<BR><VAR>See also <A href=exemple/Example19.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example19.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
      */
     TMPFile SaveASCII(in SComponent theComponent, in string theURL, in boolean isMultiFile);
index 461d8dbc24d659dcc58a3087701db60c01706b3d..d992ece005c19070c7bba5a4431e1c32fabb219e 100644 (file)
@@ -69,13 +69,13 @@ module SALOMEDS
 /*!
     Returns the value of this attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     double Value();
 /*!
    Sets the value of this attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in double value);
 
@@ -91,13 +91,13 @@ module SALOMEDS
 /*!
     Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     long   Value();
 /*!
    Sets the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in long value);
   };
@@ -123,7 +123,7 @@ module SALOMEDS
 
    \param value    A real number added to the sequence.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void      Add (in double value);
 /*!
@@ -138,7 +138,7 @@ module SALOMEDS
     \param index The index of the given real number.
     \param value The value of another real number.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void      ChangeValue(in long index, in double value);
@@ -147,13 +147,13 @@ module SALOMEDS
     in the sequence of real numbers stored in the Attribute.
     \param index The index of the given real number.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     double    Value(in short index);
 /*!
     Returns the length of the sequence of real numbers stored in the Attribute.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     long      Length();
@@ -179,7 +179,7 @@ module SALOMEDS
    Adds to the end of the sequence an integer number.
    \param value    An integer number added to the sequence.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void      Add (in long value);
@@ -188,7 +188,7 @@ module SALOMEDS
     from the sequence of integer numbers stored in the Attribute.
     \param index The index of the given integer number.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void      Remove(in long index);
@@ -204,13 +204,13 @@ module SALOMEDS
     in the sequence of integer numbers stored in the Attribute.
     \param index The index of the given integer number.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     long      Value(in short index);
 /*!
     Returns the length of the sequence of integer numbers stored in the Attribute.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     long      Length();
@@ -229,7 +229,7 @@ module SALOMEDS
 /*!
     Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
@@ -237,7 +237,7 @@ module SALOMEDS
 
    \param value This parameter defines the value of this attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -254,14 +254,14 @@ module SALOMEDS
 /*!
     Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
    \param value This string parameter defines the value of this attribute - a description of a %SObject.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -277,14 +277,14 @@ module SALOMEDS
 /*!
     Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
    \param value This parameter defines the value of this attribute - IOR of a %SObject.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -300,14 +300,14 @@ module SALOMEDS
 /*!
     Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
    \param value This parameter defines the value of this attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -322,12 +322,12 @@ module SALOMEDS
   {
 /*!
     Returns the value of this attribute
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -342,12 +342,12 @@ module SALOMEDS
   {
 /*!
     Returns the value of this attribute
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -369,7 +369,7 @@ module SALOMEDS
 /*!
    Returns TRUE if the item is drawable (as it is by default) and FALSE if it isn't.
 
-<BR><VAR>See also <A href=exemple/Example8.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example8.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean IsDrawable();
@@ -378,7 +378,7 @@ Sets the item to be drawable.
 
 \param value If the value of this boolean parameter is TRUE (default) the item will be drawable.
 
-<BR><VAR>See also <A href=exemple/Example8.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example8.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetDrawable(in boolean value);
@@ -397,7 +397,7 @@ Sets the item to be drawable.
    Returns TRUE if the item is selectable (as it is by default) and FALSE if it isn't.
 
 
-<BR><VAR>See also <A href=exemple/Example9.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example9.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean IsSelectable();
@@ -406,7 +406,7 @@ Sets the item to be selectable
 
 \param value If the value of this parameter is TRUE (the default) the item will be set as selectable.
 
-<BR><VAR>See also <A href=exemple/Example9.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example9.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetSelectable(in boolean value);
@@ -425,7 +425,7 @@ Sets the item to be selectable
 /*!
     Returns TRUE if this item is expandable even when it has no children.
 
-<BR><VAR>See also <A href=exemple/Example10.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example10.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean IsExpandable();
@@ -433,7 +433,7 @@ Sets the item to be selectable
 
  \param value If the value of this boolean parameter is TRUE, this item will be set as expandable.
 
-<BR><VAR>See also <A href=exemple/Example10.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example10.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetExpandable(in boolean value);
@@ -482,7 +482,7 @@ Sets the item to be selectable
 /*!
     Returns TRUE if this item is open (its children are visible) and FALSE if it isn't.
 
-<BR><VAR>See also <A href=exemple/Example11.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example11.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     boolean IsOpened();
@@ -492,7 +492,7 @@ Sets the item to be selectable
    \param value If the value of this boolean parameter is TRUE this item will be set as open,
     and as closed if FALSE.
 
-<BR><VAR>See also <A href=exemple/Example11.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example11.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetOpened(in boolean value);
@@ -508,7 +508,7 @@ Sets the item to be selectable
 /*!
    Returns the color of an item.
 
-<BR><VAR>See also <A href=exemple/Example12.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example12.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     Color TextColor();
@@ -517,7 +517,7 @@ Sets the item to be selectable
 
    \param value This parameter defines the color of the item.
 
-<BR><VAR>See also <A href=exemple/Example12.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example12.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetTextColor(in Color value);
@@ -536,7 +536,7 @@ Sets the item to be selectable
 
 
 
-<BR><VAR>See also <A href=exemple/Example13.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example13.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     Color TextHighlightColor();
@@ -544,7 +544,7 @@ Sets the item to be selectable
    Sets the highlight color of an item.
    \param value This parameter defines the highlight color of the item.
 
-<BR><VAR>See also <A href=exemple/Example13.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example13.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void   SetTextHighlightColor(in Color value);
@@ -564,7 +564,7 @@ Sets the item to be selectable
 /*!
    Returns the name of the icon in the format of a string.
 
-<BR><VAR>See also <A href=exemple/Example14.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example14.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     string  GetPixMap();
@@ -572,7 +572,7 @@ Sets the item to be selectable
    Sets the name of the icon.
    \param value This string parameter defines the name of the icon.
 
-<BR><VAR>See also <A href=exemple/Example14.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example14.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void    SetPixMap(in string value);
@@ -585,7 +585,7 @@ Sets the item to be selectable
    tree whith its own structure and identifier. The quantity of such trees with different
    identifiers can be arbitrary.
 
-<BR><VAR>See also <A href=exemple/Example18.html> an example </A> of usage of the methods of this interface in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example18.html"> an example </A> of usage of the methods of this interface in batchmode of %SALOME application.</VAR>
 
 */
   //==========================================================================
@@ -673,7 +673,7 @@ Sets the item to be selectable
 /*!
    Deletes a tree node.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void              Remove();
@@ -716,7 +716,7 @@ Sets the item to be selectable
 /*!
    Returns the value of this attribute.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     long   Value();
 /*!
@@ -724,7 +724,7 @@ Sets the item to be selectable
 
    \param value This parameter defines the local ID which will be set.
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in long value);
   };
@@ -740,13 +740,13 @@ Sets the item to be selectable
 /*!
    Returns the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     string Value();
 /*!
    Sets the value of this attribute
 
-<BR><VAR>See also <A href=exemple/Example1.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example1.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 */
     void   SetValue(in string value);
   };
@@ -765,7 +765,7 @@ Sets the item to be selectable
 /*!
     Adds a %SObject to the list of %SObjects which refer to this %SObject.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void          Add(in SObject anObject);
@@ -776,7 +776,7 @@ Sets the item to be selectable
 /*!
     Deletes a %SObject from the list of %SObjects which refer to this %SObject.
 
-<BR><VAR>See also <A href=exemple/Example3.html> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example3.html"> an example </A> of this method usage in batchmode of %SALOME application.</VAR>
 
 */
     void          Remove(in SObject anObject);
@@ -787,7 +787,7 @@ Sets the item to be selectable
    This attribute allows to store a table of integers (indexing from 1 like in CASCADE)
     and string titles of this table, of each row, of each column.
 
-<BR><VAR>See also <A href=exemple/Example21.html> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example21.html"> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
 
 */
   //==========================================================================
@@ -946,7 +946,7 @@ Sets the item to be selectable
 
    This attribute allows to store a table of reals (indexing from 1 like in CASCADE)
     and string titles of this table, of each row, of each column.
-<BR><VAR>See also <A href=exemple/Example21.html> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example21.html"> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
 
 */
   //==========================================================================
@@ -1096,7 +1096,7 @@ Sets the item to be selectable
 
    This attribute allows to store a table of strings (indexing from 1 like in CASCADE)
     and string titles of this table, of each row, of each column.
-<BR><VAR>See also <A href=exemple/Example21.html> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example21.html"> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
 
 */
   //==========================================================================
@@ -1245,7 +1245,7 @@ Sets the item to be selectable
 
    This attribute allows to store study properties: user name, creation date, creation
    mode, modified flag, locked flag.
-<BR><VAR>See also <A href=exemple/Example20.html> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
+<BR><VAR>See also <A href="exemple/Example20.html"> an example </A> of usage of these methods in batchmode of %SALOME application.</VAR>
 
 */
   //==========================================================================
index 55199bf365de265547ccb23d1346052f1bb216ee..7b0ac204366ffb51699b67a881aca0598ee31de3 100644 (file)
@@ -9,6 +9,7 @@ SHELL=@SHELL@
 
 HAVE_SSTREAM=@HAVE_SSTREAM@
 
+MODULE_NAME=@MODULE_NAME@
 
 LIBS=@LIBS@ 
 LIBSFORBIN=@LIBS@
index 9583f49d4235d5881920c784e740efc2e9d84200..7a75995dc7247ec986e3364f5c88c8b23a8020a6 100644 (file)
@@ -164,11 +164,11 @@ RESOURCES_FILES ?= $(RESOURCES_FILES_ALL)
 
 resources: resources-po resources-cp 
 
-resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
+resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm)
 
-resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
 
-$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
+$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : %
        cp -fr $< $@;
 
 # Make installation directories if they don't exist.
@@ -228,19 +228,19 @@ $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: %
 
 # generic rule to install .qm files :
 install-qm: resources
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done
 
 # generic rule to install resources files (png, ini ...):
 install-res: resources
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done  
 
@@ -291,7 +291,7 @@ uninstall:
 # Uninstall qm files
        @for f in X $(PO_FILES:%.po=%.qm); do         \
           if test $$f != X; then                                             \
-            $(LT_UNINSTALL) $(datadir)/resources/$$f ;                       \
+            $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ;                        \
           fi;                                                                \
        done
 
@@ -336,7 +336,7 @@ clean: mostlyclean
 #
 distclean: clean
        #remove qm file !
-       -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
+       -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm)
        #remove include files
        -$(RM) $(DEST_HEADERS)
        -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep*
@@ -383,7 +383,7 @@ distclean: clean
 %_wrap.cxx : %.i
        $(SWIG) $(SWIG_FLAGS) -o $@ $<
 
-$(top_builddir)/share/salome/resources/%.qm: %.po
+$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm: %.po
        $(MSG2QM) $< $@ ; \
 
 #------------------------------------------------------------------------------
index bb26129cb9da88e228a6caa8afbfb5754b870589..2231eed78d7cb16a9d40354c30dade12dc90c94c 100644 (file)
@@ -56,9 +56,9 @@ resources: resources-cp
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
 
-resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
 
-$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
+$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : %
        cp -fr $< $@;
 
 #data:
@@ -104,15 +104,15 @@ distclean: clean
        @@SETX@; for d in $(SUBDIRS); do        \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
-       -$(RM) $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
+       -$(RM) $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%)
        -$(RM) Makefile
 
 install-resources: resources-cp
 # one resources directory for all salome modules
-       $(INSTALL) -d $(datadir)/resources
-       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \
+       $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME)
+       @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \
           if test $$f != X; then                                                        \
-            ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1);                     \
+            ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1);                      \
           fi;                                                                           \
        done
 
@@ -120,7 +120,7 @@ install-resources: resources-cp
 uninstall-resources:
        @for f in X $(RESOURCES_FILES); do            \
           if test $$f != X; then                                             \
-            $(LT_UNINSTALL) $(datadir)/resources/$$f ;                       \
+            $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ;                        \
           fi;                                                                \
        done
 
index 9dc8b0fd346038f151796d56dc9c65b10d545638..f7e7c771cf7df31da487303a9306d0f221c7dc79 100644 (file)
@@ -35,6 +35,81 @@ ac_cv_depend_flag,
  echo "conftest.o: conftest.c" > conftest.verif
  echo "int  main() { return 0; }" > conftest.c
 
+f77int="F77INT32"
+case  $host_os in
+   irix5.* | irix6.* | osf4.* | osf5.* | linux*  )
+
+        linux64="true"
+        expr "$host_os" : 'linux' >/dev/null && test ! x"$host_cpu" = x"x86_64" && linux64="false"
+       if test ! x"$linux64" = "xfalse" ; then
+         echo "$as_me:$LINENO: checking for 64bits integers size in F77/F90" >&5
+echo $ECHO_N "checking for 64bits integers size in F77/F90... $ECHO_C" >&6
+         # Check whether --enable-int64 or --disable-int64 was given.
+if test "${enable_int64+set}" = set; then
+  enableval="$enable_int64"
+
+fi;
+         case "X-$enable_int64" in
+           X-no)
+            echo "$as_me:$LINENO: result: \"disabled\"" >&5
+echo "${ECHO_T}\"disabled\"" >&6
+            SUFFIXES="_32"
+            ;;
+           *)
+            echo "$as_me:$LINENO: result: \"enabled\"" >&5
+echo "${ECHO_T}\"enabled\"" >&6
+            SUFFIXES=""
+            f77int="F77INT64"
+            ;;
+         esac
+       fi
+     ;;
+   *)
+     ;;
+esac
+
+case $host_os in
+    linux*)
+        test x"$linux64" = x"true" && \
+          MACHINE="PCLINUX64${SUFFIXES}" || \
+       MACHINE=PCLINUX
+       ;;
+    hpux*)
+       MACHINE=HP9000
+       ;;
+    aix4.*)
+       MACHINE=RS6000
+       host_os_novers=aix4.x
+       ;;
+    irix5.*)
+       MACHINE="IRIX64${SUFFIXES}"
+       host_os_novers=irix5.x
+       ;;
+    irix6.*)
+       MACHINE="IRIX64${SUFFIXES}"
+       host_os_novers=irix6.x
+       ;;
+    osf4.*)
+       MACHINE="OSF1${SUFFIXES}"
+       host_os_novers=osf4.x
+       ;;
+    osf5.*)
+       MACHINE="OSF1${SUFFIXES}"
+        host_os_novers=osf5.x
+        ;;
+    solaris2.*)
+       MACHINE=SUN4SOL2
+        host_os_novers=solaris2.x
+        ;;
+    uxpv*)
+       MACHINE=VPP5000
+        ;;
+    *)
+       MACHINE=
+        host_os_novers=$host_os
+        ;;
+esac
+
 dnl Evolution portage sur CCRT/osf system
  case $host_os in
    osf*)
@@ -44,14 +119,14 @@ dnl on utilise donc gnu pour generer les dependances.
      DEPCXX=g++
      DEPCXXFLAGS="-Wno-deprecated"
      DIFFFLAGS="-w"
-     MACHINE="OSF1"
+dnl  MACHINE="OSF1"
      ;;
    *)
      DEPCC=${CC-cc}
      DEPCXX=${CXX-c++}
      DEPCXXFLAGS="\${CXXFLAGS}"
      DIFFFLAGS="-b -B"
-     MACHINE="PCLINUX"
+dnl  MACHINE="PCLINUX"
      ;;
  esac
  C_DEPEND_FLAG=
index 2db76b8753ba1dba215a459582afb36ca9484bf7..ab2ba319dd9586d665d06135966fe590c19ec3c9 100644 (file)
@@ -107,6 +107,7 @@ else
   occ_ok=yes
   OCC_VERSION_MAJOR=0
   OCC_VERSION_MINOR=0
+  OCC_VERSION_MAINTENANCE=0
   ff=$CASROOT/inc/Standard_Version.hxx
   if test -f $ff ; then
     grep "define OCC_VERSION_MAJOR" $ff > /dev/null
@@ -117,6 +118,10 @@ else
     if test $? = 0 ; then
       OCC_VERSION_MINOR=`grep "define OCC_VERSION_MINOR" $ff | awk '{i=3 ; print $i}'`
     fi
+    grep "define OCC_VERSION_MAINTENANCE" $ff > /dev/null
+    if test $? = 0 ; then
+      OCC_VERSION_MAINTENANCE=`grep "define OCC_VERSION_MAINTENANCE" $ff | awk '{i=3 ; print $i}'`
+    fi
   fi
 fi
 
@@ -135,10 +140,21 @@ dnl cascade headers
   CPPFLAGS_old="$CPPFLAGS"
 case $host_os in
    linux*)
-      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H"
+
+      OCC_VERSION_STRING="$OCC_VERSION_MAJOR.$OCC_VERSION_MINOR.$OCC_VERSION_MAINTENANCE"
+      case $OCC_VERSION_STRING in
+        [[0-5]].* | 6.0.* | 6.1.0) # catch versions < 6.1.1
+          CAS_CPPFLAGS="$CAS_CPPFLAGS -DNO_CXX_EXCEPTION"
+          ;;
+        *)
+          CAS_CPPFLAGS="$CAS_CPPFLAGS -DOCC_CONVERT_SIGNALS"
+          ;;
+      esac
+      CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc"
       ;;
    osf*)
-      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+      CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
       ;;
 esac
   CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
@@ -171,11 +187,10 @@ if test "x$occ_ok" = xyes ; then
   
   AC_CACHE_VAL(salome_cv_lib_occ,[
     AC_TRY_LINK(
-#include <Standard_Type.hxx>
+#include <TCollection_AsciiString.hxx>
 ,   size_t size;
-    const Standard_CString aName="toto";
-    Standard_Type myST(aName) ; 
-    myST.Find(aName);,
+    TCollection_AsciiString aStr ("toto");
+    aStr.Capitalize();, 
     eval "salome_cv_lib_occ=yes",eval "salome_cv_lib_occ=no")
   ])
   occ_ok="$salome_cv_lib_occ"
index 0ce538bb85cc7ee026a4f024e6572cb1ce99b522..51fab4770970f7f000ce0a82ef95fef7b0c4e0e6 100755 (executable)
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-#   Free Software Foundation, Inc.
-#
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-03-12'
+
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.
 
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
-  if test x"$HOST_CC" != x; then
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
 fi
 
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+       for c in cc gcc c89 c99 ; do
+         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+            CC_FOR_BUILD="$c"; break ;
+         fi ;
+       done ;
+       if test x"$CC_FOR_BUILD" = x ; then
+         CC_FOR_BUILD=no_compiler_found ;
+       fi
+       ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
        PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-       # Netbsd (nbsd) targets should (where applicable) match one or
+       # NetBSD (nbsd) targets should (where applicable) match one or
        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
        # switched to ELF, *-*-netbsd* would select the old
        # object file format.  This provides both forward
        # compatibility and a consistent mechanism for selecting the
        # object file format.
-       # Determine the machine/vendor (is the vendor relevant).
-       case "${UNAME_MACHINE}" in
-           amiga) machine=m68k-cbm ;;
-           arm32) machine=arm-unknown ;;
-           atari*) machine=m68k-atari ;;
-           sun3*) machine=m68k-sun ;;
-           mac68k) machine=m68k-apple ;;
-           macppc) machine=powerpc-apple ;;
-           hp3[0-9][05]) machine=m68k-hp ;;
-           ibmrt|romp-ibm) machine=romp-ibm ;;
-           *) machine=${UNAME_MACHINE}-unknown ;;
+       #
+       # Note: NetBSD doesn't particularly care about the vendor
+       # portion of the name.  We always set it to "unknown".
+       sysctl="sysctl -n hw.machine_arch"
+       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+       case "${UNAME_MACHINE_ARCH}" in
+           armeb) machine=armeb-unknown ;;
+           arm*) machine=arm-unknown ;;
+           sh3el) machine=shl-unknown ;;
+           sh3eb) machine=sh-unknown ;;
+           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+       esac
+       # The Operating System including object format, if it has switched
+       # to ELF recently, or will in the future.
+       case "${UNAME_MACHINE_ARCH}" in
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+               eval $set_cc_for_build
+               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                       | grep __ELF__ >/dev/null
+               then
+                   # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                   # Return netbsd for either.  FIX?
+                   os=netbsd
+               else
+                   os=netbsdelf
+               fi
+               ;;
+           *)
+               os=netbsd
+               ;;
        esac
-       # The Operating System including object format.
-       if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-               | grep __ELF__ >/dev/null
-       then
-           # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-           # Return netbsd for either.  FIX?
-           os=netbsd
-       else
-           os=netbsdelf
-       fi
        # The OS release
-       release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+       # Debian GNU/NetBSD machines have a different userland, and
+       # thus, need a distinct triplet. However, they do not need
+       # kernel version information, so it can be replaced with a
+       # suitable tag, in the style of linux-gnu.
+       case "${UNAME_VERSION}" in
+           Debian*)
+               release='-gnu'
+               ;;
+           *)
+               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+               ;;
+       esac
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
        exit 0 ;;
+    amd64:OpenBSD:*:*)
+       echo x86_64-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    amiga:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    arc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    cats:OpenBSD:*:*)
+       echo arm-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    hp300:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mac68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    macppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    pegasos:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    pmax:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sgi:OpenBSD:*:*)
+       echo mipseb-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sun3:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    *:OpenBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    *:ekkoBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+       exit 0 ;;
+    macppc:MirBSD:*:*)
+       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+       exit 0 ;;
+    *:MirBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+       exit 0 ;;
     alpha:OSF1:*:*)
-       if test $UNAME_RELEASE = "V4.0"; then
+       case $UNAME_RELEASE in
+       *4.0)
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-       fi
+               ;;
+       *5.*)
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+               ;;
+       esac
+       # According to Compaq, /usr/sbin/psrinfo has been available on
+       # OSF/1 and Tru64 systems produced since 1995.  I hope that
+       # covers most systems running today.  This code pipes the CPU
+       # types through head -n 1, so we only detect the type of CPU 0.
+       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+       case "$ALPHA_CPU_TYPE" in
+           "EV4 (21064)")
+               UNAME_MACHINE="alpha" ;;
+           "EV4.5 (21064)")
+               UNAME_MACHINE="alpha" ;;
+           "LCA4 (21066/21068)")
+               UNAME_MACHINE="alpha" ;;
+           "EV5 (21164)")
+               UNAME_MACHINE="alphaev5" ;;
+           "EV5.6 (21164A)")
+               UNAME_MACHINE="alphaev56" ;;
+           "EV5.6 (21164PC)")
+               UNAME_MACHINE="alphapca56" ;;
+           "EV5.7 (21164PC)")
+               UNAME_MACHINE="alphapca57" ;;
+           "EV6 (21264)")
+               UNAME_MACHINE="alphaev6" ;;
+           "EV6.7 (21264A)")
+               UNAME_MACHINE="alphaev67" ;;
+           "EV6.8CB (21264C)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.8AL (21264B)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.8CX (21264D)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.9A (21264/EV69A)")
+               UNAME_MACHINE="alphaev69" ;;
+           "EV7 (21364)")
+               UNAME_MACHINE="alphaev7" ;;
+           "EV7.9 (21364A)")
+               UNAME_MACHINE="alphaev79" ;;
+       esac
+       # A Pn.n version is a patched version.
        # A Vn.n version is a released version.
        # A Tn.n version is a released field test version.
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
-       cat <<EOF >$dummy.s
-       .data
-\$Lformat:
-       .byte 37,100,45,37,120,10,0     # "%d-%x\n"
-
-       .text
-       .globl main
-       .align 4
-       .ent main
-main:
-       .frame \$30,16,\$26,0
-       ldgp \$29,0(\$27)
-       .prologue 1
-       .long 0x47e03d80 # implver \$0
-       lda \$2,-1
-       .long 0x47e20c21 # amask \$2,\$1
-       lda \$16,\$Lformat
-       mov \$0,\$17
-       not \$1,\$18
-       jsr \$26,printf
-       ldgp \$29,0(\$26)
-       mov 0,\$16
-       jsr \$26,exit
-       .end main
-EOF
-       $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-       if test "$?" = 0 ; then
-               case `./$dummy` in
-                       0-0)
-                               UNAME_MACHINE="alpha"
-                               ;;
-                       1-0)
-                               UNAME_MACHINE="alphaev5"
-                               ;;
-                       1-1)
-                               UNAME_MACHINE="alphaev56"
-                               ;;
-                       1-101)
-                               UNAME_MACHINE="alphapca56"
-                               ;;
-                       2-303)
-                               UNAME_MACHINE="alphaev6"
-                               ;;
-                       2-307)
-                               UNAME_MACHINE="alphaev67"
-                               ;;
-               esac
-       fi
-       rm -f $dummy.s $dummy
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+       exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+       echo alpha-hp-vms
        exit 0 ;;
     Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -173,39 +320,24 @@ EOF
        echo alpha-dec-winnt3.5
        exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-       echo m68k-cbm-sysv4
+       echo m68k-unknown-sysv4
        exit 0;;
-    amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
        exit 0 ;;
-    arc64:OpenBSD:*:*)
-       echo mips64el-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    arc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    hkmips:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    pmax:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sgi:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+       echo ${UNAME_MACHINE}-unknown-morphos
        exit 0 ;;
     *:OS/390:*:*)
        echo i370-ibm-openedition
        exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+       exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -219,6 +351,13 @@ EOF
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
        exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+       echo sparc-icl-nx6
+       exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+       case `/usr/bin/uname -p` in
+           sparc) echo sparc-icl-nx7 && exit 0 ;;
+       esac ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
@@ -247,7 +386,7 @@ EOF
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
     sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)
@@ -261,9 +400,6 @@ EOF
     aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;
-    atari*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -290,17 +426,8 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mac68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
+    m68k:machten:*:*)
+       echo m68k-apple-machten${UNAME_RELEASE}
        exit 0 ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
@@ -318,6 +445,7 @@ EOF
        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -339,12 +467,20 @@ EOF
          exit (-1);
        }
 EOF
-       $CC_FOR_BUILD $dummy.c -o $dummy \
-         && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && rm $dummy.c $dummy && exit 0
-       rm -f $dummy.c $dummy
+       $CC_FOR_BUILD -o $dummy $dummy.c \
+         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+         && exit 0
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+       echo powerpc-motorola-powermax
+       exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+       echo powerpc-harris-powermax
+       exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+       echo powerpc-harris-powermax
+       exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
@@ -392,11 +528,20 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
        echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
        echo i386-ibm-aix
        exit 0 ;;
+    ia64:AIX:*:*)
+       if [ -x /usr/bin/oslevel ] ; then
+               IBM_REV=`/usr/bin/oslevel`
+       else
+               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+       fi
+       echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+       exit 0 ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+               eval $set_cc_for_build
                sed 's/^                //' << EOF >$dummy.c
                #include <sys/systemcfg.h>
 
@@ -408,8 +553,7 @@ EOF
                        exit(0);
                        }
 EOF
-               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-               rm -f $dummy.c $dummy
+               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
@@ -417,9 +561,9 @@ EOF
                echo rs6000-ibm-aix3.2
        fi
        exit 0 ;;
-    *:AIX:*:4)
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-       if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+    *:AIX:*:[45])
+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                IBM_ARCH=rs6000
        else
                IBM_ARCH=powerpc
@@ -427,7 +571,7 @@ EOF
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
        else
-               IBM_REV=4.${UNAME_RELEASE}
+               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;
@@ -453,11 +597,28 @@ EOF
        echo m68k-hp-bsd4.4
        exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
+       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
-              sed 's/^              //' << EOF >$dummy.c
+               if [ -x /usr/bin/getconf ]; then
+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+               fi
+               if [ "${HP_ARCH}" = "" ]; then
+                   eval $set_cc_for_build
+                   sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -490,13 +651,29 @@ EOF
                   exit (0);
               }
 EOF
-       (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-       rm -f $dummy.c $dummy
+                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                   test -z "$HP_ARCH" && HP_ARCH=hppa
+               fi ;;
        esac
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+       if [ ${HP_ARCH} = "hppa2.0w" ]
+       then
+           # avoid double evaluation of $set_cc_for_build
+           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+           then
+               HP_ARCH="hppa2.0w"
+           else
+               HP_ARCH="hppa64"
+           fi
+       fi
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
        exit 0 ;;
+    ia64:HP-UX:*:*)
+       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+       echo ia64-hp-hpux${HPUX_REV}
+       exit 0 ;;
     3050*:HI-UX:*:*)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
        #include <unistd.h>
        int
@@ -522,8 +699,7 @@ EOF
          exit (0);
        }
 EOF
-       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-       rm -f $dummy.c $dummy
+       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -532,7 +708,7 @@ EOF
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -541,7 +717,7 @@ EOF
     hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
        exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
@@ -551,9 +727,6 @@ EOF
     parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
        exit 0 ;;
-    hppa*:OpenBSD:*:*)
-       echo hppa-unknown-openbsd
-       exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
         exit 0 ;;
@@ -572,41 +745,39 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-       echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
-       echo ymp-cray-unicos${UNAME_RELEASE}
+       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+             -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*T3E:*:*:*)
-       echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+       echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
-    CRAY-2:*:*:*)
-       echo cray2-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    *:UNICOS/mp:*:*)
+       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+       exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp300:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -616,10 +787,21 @@ EOF
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        exit 0 ;;
     *:FreeBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit 0 ;;
-    *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+       # Determine whether the default compiler uses glibc.
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #include <features.h>
+       #if __GLIBC__ >= 2
+       LIBC=gnu
+       #else
+       LIBC=
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+       # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+       # FreeBSD's kernel, but not the complete OS.
+       case ${LIBC} in gnu) kernel_only='k' ;; esac
+       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
        exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
@@ -627,11 +809,20 @@ EOF
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
+    i*:PW*:*)
+       echo ${UNAME_MACHINE}-pc-pw32
+       exit 0 ;;
+    x86:Interix*:[34]*)
+       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+       exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+       echo i${UNAME_MACHINE}-pc-mks
+       exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i386-pc-interix
+       echo i586-pc-interix
        exit 0 ;;
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
@@ -643,221 +834,178 @@ EOF
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
     *:GNU:*:*)
+       # the GNU system
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit 0 ;;
-    *:Linux:*:*)
-
+    *:GNU/*:*:*)
+       # other systems with GNU libc and userland
+       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+       exit 0 ;;
+    i*86:Minix:*:*)
+       echo ${UNAME_MACHINE}-pc-minix
+       exit 0 ;;
+    arm*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    cris:Linux:*:*)
+       echo cris-axis-linux-gnu
+       exit 0 ;;
+    ia64:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    m32r*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    m68*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    mips:Linux:*:*)
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #undef CPU
+       #undef mips
+       #undef mipsel
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=mipsel
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=mips
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       ;;
+    mips64:Linux:*:*)
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #undef CPU
+       #undef mips64
+       #undef mips64el
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=mips64el
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=mips64
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       ;;
+    ppc:Linux:*:*)
+       echo powerpc-unknown-linux-gnu
+       exit 0 ;;
+    ppc64:Linux:*:*)
+       echo powerpc64-unknown-linux-gnu
+       exit 0 ;;
+    alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+         EV5)   UNAME_MACHINE=alphaev5 ;;
+         EV56)  UNAME_MACHINE=alphaev56 ;;
+         PCA56) UNAME_MACHINE=alphapca56 ;;
+         PCA57) UNAME_MACHINE=alphapca56 ;;
+         EV6)   UNAME_MACHINE=alphaev6 ;;
+         EV67)  UNAME_MACHINE=alphaev67 ;;
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+       objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+       exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+       # Look for CPU level
+       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+         PA7*) echo hppa1.1-unknown-linux-gnu ;;
+         PA8*) echo hppa2.0-unknown-linux-gnu ;;
+         *)    echo hppa-unknown-linux-gnu ;;
+       esac
+       exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+       echo hppa64-unknown-linux-gnu
+       exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+       echo ${UNAME_MACHINE}-ibm-linux
+       exit 0 ;;
+    sh64*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    sh*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
+    x86_64:Linux:*:*)
+       echo x86_64-unknown-linux-gnu
+       exit 0 ;;
+    i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.
-       ld_help_string=`cd /; ld --help 2>&1`
-       ld_supported_emulations=`echo $ld_help_string \
-                        | sed -ne '/supported emulations:/!d
+       # Set LC_ALL=C to ensure ld outputs messages in English.
+       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+                        | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
-                                   s/.*supported emulations: *//
+                                   s/.*supported targets: *//
                                    s/ .*//
                                    p'`
-        case "$ld_supported_emulations" in
-         *ia64)
-               echo "${UNAME_MACHINE}-unknown-linux"
-               exit 0
+        case "$ld_supported_targets" in
+         elf32-i386)
+               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;
-         i?86linux)
+         a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit 0
-               ;;
-         elf_i?86)
-               echo "${UNAME_MACHINE}-pc-linux"
-               exit 0
-               ;;
-         i?86coff)
+               exit 0 ;;
+         coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-               exit 0
-               ;;
-         sparclinux)
-               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-               exit 0
-               ;;
-         armlinux)
-               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-               exit 0
-               ;;
-         elf32arm*)
-               echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-               exit 0
-               ;;
-         armelf_linux*)
-               echo "${UNAME_MACHINE}-unknown-linux-gnu"
-               exit 0
-               ;;
-         m68klinux)
-               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-               exit 0
-               ;;
-         elf32ppc | elf32ppclinux)
-               # Determine Lib Version
-               cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unkown\n");
-#endif
-  return 0;
-}
-EOF
-               LIBC=""
-               $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-               if test "$?" = 0 ; then
-                       ./$dummy | grep 1\.99 > /dev/null
-                       if test "$?" = 0 ; then
-                               LIBC="libc1"
-                       fi
-               fi
-               rm -f $dummy.c $dummy
-               echo powerpc-unknown-linux-gnu${LIBC}
-               exit 0
-               ;;
+               exit 0 ;;
+         "")
+               # Either a pre-BFD a.out linker (linux-gnuoldld) or
+               # one that does not give us useful --help.
+               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+               exit 0 ;;
        esac
-
-       if test "${UNAME_MACHINE}" = "alpha" ; then
-               cat <<EOF >$dummy.s
-                       .data
-               \$Lformat:
-                       .byte 37,100,45,37,120,10,0     # "%d-%x\n"
-
-                       .text
-                       .globl main
-                       .align 4
-                       .ent main
-               main:
-                       .frame \$30,16,\$26,0
-                       ldgp \$29,0(\$27)
-                       .prologue 1
-                       .long 0x47e03d80 # implver \$0
-                       lda \$2,-1
-                       .long 0x47e20c21 # amask \$2,\$1
-                       lda \$16,\$Lformat
-                       mov \$0,\$17
-                       not \$1,\$18
-                       jsr \$26,printf
-                       ldgp \$29,0(\$26)
-                       mov 0,\$16
-                       jsr \$26,exit
-                       .end main
-EOF
-               LIBC=""
-               $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-               if test "$?" = 0 ; then
-                       case `./$dummy` in
-                       0-0)
-                               UNAME_MACHINE="alpha"
-                               ;;
-                       1-0)
-                               UNAME_MACHINE="alphaev5"
-                               ;;
-                       1-1)
-                               UNAME_MACHINE="alphaev56"
-                               ;;
-                       1-101)
-                               UNAME_MACHINE="alphapca56"
-                               ;;
-                       2-303)
-                               UNAME_MACHINE="alphaev6"
-                               ;;
-                       2-307)
-                               UNAME_MACHINE="alphaev67"
-                               ;;
-                       esac
-
-                       objdump --private-headers $dummy | \
-                         grep ld.so.1 > /dev/null
-                       if test "$?" = 0 ; then
-                               LIBC="libc1"
-                       fi
-               fi
-               rm -f $dummy.s $dummy
-               echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-       elif test "${UNAME_MACHINE}" = "mips" ; then
-         cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-         $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-         rm -f $dummy.c $dummy
-       elif test "${UNAME_MACHINE}" = "s390"; then
-         echo s390-ibm-linux && exit 0
-       else
-         # Either a pre-BFD a.out linker (linux-gnuoldld)
-         # or one that does not give us useful --help.
-         # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-         # If ld does not provide *any* "supported emulations:"
-         # that means it is gnuoldld.
-         echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-         test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-         case "${UNAME_MACHINE}" in
-         i?86)
-           VENDOR=pc;
-           ;;
-         *)
-           VENDOR=unknown;
-           ;;
-         esac
-         # Determine whether the default compiler is a.out or elf
-         cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+       # Determine whether the default compiler is a.out or elf
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #include <features.h>
+       #ifdef __ELF__
+       # ifdef __GLIBC__
+       #  if __GLIBC__ >= 2
+       LIBC=gnu
+       #  else
+       LIBC=gnulibc1
+       #  endif
+       # else
+       LIBC=gnulibc1
+       # endif
+       #else
+       #ifdef __INTEL_COMPILER
+       LIBC=gnu
+       #else
+       LIBC=gnuaout
+       #endif
+       #endif
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
 EOF
-         $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-         rm -f $dummy.c $dummy
-       fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+       ;;
+    i*86:DYNIX/ptx:4*:*)
+       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+       # earlier versions are messed up and put the nodename in both
+       # sysname and nodename.
        echo i386-sequent-sysv4
        exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -865,7 +1013,27 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
        exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:OS/2:*:*)
+       # If we were able to find `uname', then EMX Unix compatibility
+       # is probably installed.
+       echo ${UNAME_MACHINE}-pc-os2-emx
+       exit 0 ;;
+    i*86:XTS-300:*:STOP)
+       echo ${UNAME_MACHINE}-unknown-stop
+       exit 0 ;;
+    i*86:atheos:*:*)
+       echo ${UNAME_MACHINE}-unknown-atheos
+       exit 0 ;;
+       i*86:syllable:*:*)
+       echo ${UNAME_MACHINE}-pc-syllable
+       exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+       echo i386-unknown-lynxos${UNAME_RELEASE}
+       exit 0 ;;
+    i*86:*DOS:*:*)
+       echo ${UNAME_MACHINE}-pc-msdosdjgpp
+       exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -873,36 +1041,32 @@ EOF
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
        exit 0 ;;
-    i?86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-           echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-       else
-           echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-       fi
+    i*86:*:5:[78]*)
+       case `/bin/uname -X | grep "^Machine"` in
+           *486*)           UNAME_MACHINE=i486 ;;
+           *Pentium)        UNAME_MACHINE=i586 ;;
+           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+       esac
+       echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
        exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
        elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                        && UNAME_MACHINE=i586
-               (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                        && UNAME_MACHINE=i686
-               (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                        && UNAME_MACHINE=i686
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
        exit 0 ;;
-    i?86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit 0 ;;
     pc:*:*:*)
        # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -926,9 +1090,15 @@ EOF
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+       echo m68k-convergent-sysv
+       exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+       echo m68k-diab-dnix
+       exit 0 ;;
     M68*:*:R3V[567]*:*)
        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -939,21 +1109,21 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
        echo m68k-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
        exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+       echo powerpc-unknown-lynxos${UNAME_RELEASE}
+       exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
        exit 0 ;;
@@ -971,8 +1141,8 @@ EOF
                echo ns32k-sni-sysv
        fi
        exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -984,10 +1154,14 @@ EOF
        # From seanf@swdc.stratus.com.
        echo i860-stratus-sysv4
        exit 0 ;;
+    *:VOS:*:*)
+       # From Paul.Green@stratus.com.
+       echo hppa1.1-stratus-vos
+       exit 0 ;;
     mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
        exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
        echo mips-sony-newsos6
        exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1012,6 +1186,9 @@ EOF
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
        exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+       echo sx6-nec-superux${UNAME_RELEASE}
+       exit 0 ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
@@ -1019,31 +1196,76 @@ EOF
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
     *:Darwin:*:*)
-       echo `uname -p`-apple-darwin${UNAME_RELEASE}
+       case `uname -p` in
+           *86) UNAME_PROCESSOR=i686 ;;
+           powerpc) UNAME_PROCESSOR=powerpc ;;
+       esac
+       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
        exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       if test "${UNAME_MACHINE}" = "x86pc"; then
+       UNAME_PROCESSOR=`uname -p`
+       if test "$UNAME_PROCESSOR" = "x86"; then
+               UNAME_PROCESSOR=i386
                UNAME_MACHINE=pc
        fi
-       echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
        exit 0 ;;
     *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
-    NSR-W:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
+    *:NonStop-UX:*:*)
+       echo mips-compaq-nonstopux
+       exit 0 ;;
     BS2000:POSIX*:*:*)
        echo bs2000-siemens-sysv
        exit 0 ;;
     DS/*:UNIX_System_V:*:*)
        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
        exit 0 ;;
+    *:Plan9:*:*)
+       # "uname -m" is not consistent, so use $cputype instead. 386
+       # is converted to i386 for consistency with other x86
+       # operating systems.
+       if test "$cputype" = "386"; then
+           UNAME_MACHINE=i386
+       else
+           UNAME_MACHINE="$cputype"
+       fi
+       echo ${UNAME_MACHINE}-unknown-plan9
+       exit 0 ;;
+    *:TOPS-10:*:*)
+       echo pdp10-unknown-tops10
+       exit 0 ;;
+    *:TENEX:*:*)
+       echo pdp10-unknown-tenex
+       exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+       echo pdp10-dec-tops20
+       exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+       echo pdp10-xkl-tops20
+       exit 0 ;;
+    *:TOPS-20:*:*)
+       echo pdp10-unknown-tops20
+       exit 0 ;;
+    *:ITS:*:*)
+       echo pdp10-unknown-its
+       exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+       exit 0 ;;
+    *:DragonFly:*:*)
+       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+       exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1130,11 +1352,24 @@ main ()
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1145,8 +1380,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
@@ -1178,6 +1412,48 @@ then
     esac
 fi
 
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
 
 exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
index c8e77851e69dd619632d512ff3cf4468f39b6d91..ba331039bb873ee5c5740459fc127af6d23578c1 100755 (executable)
@@ -1,8 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-#   Free Software Foundation, Inc.
-#
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-03-12'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -27,8 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 #      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-if [ x$1 = x ]
-then
-       echo Configuration name missing. 1>&2
-       echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-       echo "or     $0 ALIAS" 1>&2
-       echo where ALIAS is a recognized configuration type. 1>&2
-       exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
 
-# First pass through any local machine types.
-case $1 in
-       *local*)
-               echo $1
-               exit 0
-               ;;
-       *)
-       ;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -99,7 +145,7 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple)
+       -apple | -axis)
                os=
                basic_machine=$1
                ;;
@@ -113,6 +159,14 @@ case $os in
                os=-vxworks
                basic_machine=$1
                ;;
+       -chorusos*)
+               os=-chorusos
+               basic_machine=$1
+               ;;
+       -chorusrdb)
+               os=-chorusrdb
+               basic_machine=$1
+               ;;
        -hiux*)
                os=-hiuxwe2
                ;;
@@ -171,30 +225,64 @@ esac
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
-       tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-               | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-               | 580 | i960 | h8300 \
-               | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
-               | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-               | hppa64 \
-               | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-               | alphaev6[78] \
-               | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-               | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-               | mips64orion | mips64orionel | mipstx39 | mipstx39el \
-               | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-               | mips64vr5000 | miprs64vr5000el | mcore \
-               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-               | thumb | d10v | fr30 | avr)
+       1750a | 580 \
+       | a29k \
+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+       | c4x | clipper \
+       | d10v | d30v | dlx | dsp16xx \
+       | fr30 | frv \
+       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+       | i370 | i860 | i960 | ia64 \
+       | ip2k | iq2000 \
+       | m32r | m32rle | m68000 | m68k | m88k | mcore \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipstx39 | mipstx39el \
+       | mn10200 | mn10300 \
+       | msp430 \
+       | ns16k | ns32k \
+       | openrisc | or32 \
+       | pdp10 | pdp11 | pj | pjl \
+       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+       | pyramid \
+       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
+       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+       | strongarm \
+       | tahoe | thumb | tic4x | tic80 | tron \
+       | v850 | v850e \
+       | we32k \
+       | x86 | xscale | xstormy16 | xtensa \
+       | z8k)
                basic_machine=$basic_machine-unknown
                ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+       m6811 | m68hc11 | m6812 | m68hc12)
+               # Motorola 68HC11/12.
+               basic_machine=$basic_machine-unknown
+               os=-none
+               ;;
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                ;;
 
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.
-       i[34567]86)
+       i*86 | x86_64)
          basic_machine=$basic_machine-pc
          ;;
        # Object if more than one company name word.
@@ -203,28 +291,61 @@ case $basic_machine in
                exit 1
                ;;
        # Recognize the basic CPU types with company name.
-       # FIXME: clean up the formatting here.
-       vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-             | xmp-* | ymp-* \
-             | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
-             | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-             | hppa2.0n-* | hppa64-* \
-             | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-             | alphaev6[78]-* \
-             | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-             | clipper-* | orion-* \
-             | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-             | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-             | mips64el-* | mips64orion-* | mips64orionel-* \
-             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-             | mipstx39-* | mipstx39el-* | mcore-* \
-             | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
-             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-             | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-             | bs2000-*)
+       580-* \
+       | a29k-* \
+       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+       | avr-* \
+       | bs2000-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+       | clipper-* | cydra-* \
+       | d10v-* | d30v-* | dlx-* \
+       | elxsi-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+       | h8300-* | h8500-* \
+       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+       | i*86-* | i860-* | i960-* | ia64-* \
+       | ip2k-* | iq2000-* \
+       | m32r-* | m32rle-* \
+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+       | m88110-* | m88k-* | mcore-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipstx39-* | mipstx39el-* \
+       | msp430-* \
+       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+       | orion-* \
+       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+       | pyramid-* \
+       | romp-* | rs6000-* \
+       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tron-* \
+       | v850-* | v850e-* | vax-* \
+       | we32k-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+       | xtensa-* \
+       | ymp-* \
+       | z8k-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
@@ -242,6 +363,9 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
        adobe68k)
                basic_machine=m68010-adobe
                os=-scout
@@ -256,19 +380,25 @@ case $basic_machine in
                basic_machine=a29k-none
                os=-bsd
                ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
+       amd64-*)
+               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        amdahl)
                basic_machine=580-amdahl
                os=-sysv
                ;;
        amiga | amiga-*)
-               basic_machine=m68k-cbm
+               basic_machine=m68k-unknown
                ;;
        amigaos | amigados)
-               basic_machine=m68k-cbm
+               basic_machine=m68k-unknown
                os=-amigaos
                ;;
        amigaunix | amix)
-               basic_machine=m68k-cbm
+               basic_machine=m68k-unknown
                os=-sysv4
                ;;
        apollo68)
@@ -287,6 +417,10 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
+       c90)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;
        convex-c1)
                basic_machine=c1-convex
                os=-bsd
@@ -307,27 +441,38 @@ case $basic_machine in
                basic_machine=c38-convex
                os=-bsd
                ;;
-       cray | ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       cray2)
-               basic_machine=cray2-cray
+       cray | j90)
+               basic_machine=j90-cray
                os=-unicos
                ;;
-       [ctj]90-cray)
-               basic_machine=c90-cray
-               os=-unicos
+       cr16c)
+               basic_machine=cr16c-unknown
+               os=-elf
                ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;
+       cris | cris-* | etrax*)
+               basic_machine=cris-axis
+               ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
        decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                basic_machine=mips-dec
                ;;
+       decsystem10* | dec10*)
+               basic_machine=pdp10-dec
+               os=-tops10
+               ;;
+       decsystem20* | dec20*)
+               basic_machine=pdp10-dec
+               os=-tops20
+               ;;
        delta | 3300 | motorola-3300 | motorola-delta \
              | 3300-motorola | delta-motorola)
                basic_machine=m68k-motorola
@@ -369,6 +514,10 @@ case $basic_machine in
                basic_machine=tron-gmicro
                os=-sysv
                ;;
+       go32)
+               basic_machine=i386-pc
+               os=-go32
+               ;;
        h3050r* | hiux*)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
@@ -444,19 +593,19 @@ case $basic_machine in
                basic_machine=i370-ibm
                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-       i[34567]86v32)
+       i*86v32)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv32
                ;;
-       i[34567]86v4*)
+       i*86v4*)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv4
                ;;
-       i[34567]86v)
+       i*86v)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv
                ;;
-       i[34567]86sol2)
+       i*86sol2)
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;
@@ -468,14 +617,6 @@ case $basic_machine in
                basic_machine=i386-unknown
                os=-vsta
                ;;
-       i386-go32 | go32)
-               basic_machine=i386-unknown
-               os=-go32
-               ;;
-       i386-mingw32 | mingw32)
-               basic_machine=i386-unknown
-               os=-mingw32
-               ;;
        iris | iris4d)
                basic_machine=mips-sgi
                case $os in
@@ -501,6 +642,10 @@ case $basic_machine in
                basic_machine=ns32k-utek
                os=-sysv
                ;;
+       mingw32)
+               basic_machine=i386-pc
+               os=-mingw32
+               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -508,14 +653,6 @@ case $basic_machine in
                basic_machine=m68k-atari
                os=-mint
                ;;
-       mipsel*-linux*)
-               basic_machine=mipsel-unknown
-               os=-linux-gnu
-               ;;
-       mips*-linux*)
-               basic_machine=mips-unknown
-               os=-linux-gnu
-               ;;
        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
@@ -530,8 +667,12 @@ case $basic_machine in
                basic_machine=m68k-rom68k
                os=-coff
                ;;
+       morphos)
+               basic_machine=powerpc-unknown
+               os=-morphos
+               ;;
        msdos)
-               basic_machine=i386-unknown
+               basic_machine=i386-pc
                os=-msdos
                ;;
        mvs)
@@ -595,9 +736,17 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-mon960
                ;;
+       nonstopux)
+               basic_machine=mips-compaq
+               os=-nonstopux
+               ;;
        np1)
                basic_machine=np1-gould
                ;;
+       nv1)
+               basic_machine=nv1-cray
+               os=-unicosmp
+               ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
@@ -605,6 +754,14 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
+       or32 | or32-*)
+               basic_machine=or32-unknown
+               os=-coff
+               ;;
+       os400)
+               basic_machine=powerpc-ibm
+               os=-os400
+               ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
                os=-ose
@@ -627,45 +784,65 @@ case $basic_machine in
        pbb)
                basic_machine=m68k-tti
                ;;
-        pc532 | pc532-*)
+       pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pentium | p5 | k5 | k6 | nexen)
+       pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
-       pentiumpro | p6 | 6x86)
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)
+               basic_machine=i686-pc
+               ;;
+       pentiumii | pentium2 | pentiumiii | pentium3)
                basic_machine=i686-pc
                ;;
-       pentiumii | pentium2)
+       pentium4)
                basic_machine=i786-pc
                ;;
-       pentium-* | p5-* | k5-* | k6-* | nexen-*)
+       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       pentiumpro-* | p6-* | 6x86-*)
+       pentiumpro-* | p6-* | 6x86-* | athlon-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       pentiumii-* | pentium2-*)
+       pentium4-*)
                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pn)
                basic_machine=pn-gould
                ;;
-       power)  basic_machine=rs6000-ibm
+       power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown
-               ;;
+               ;;
        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
-               ;;
+               ;;
        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
+       ppc64)  basic_machine=powerpc64-unknown
+               ;;
+       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+               basic_machine=powerpc64le-unknown
+               ;;
+       ppc64le-* | powerpc64little-*)
+               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        ps2)
                basic_machine=i386-ibm
                ;;
+       pw32)
+               basic_machine=i586-unknown
+               os=-pw32
+               ;;
        rom68k)
                basic_machine=m68k-rom68k
                os=-coff
@@ -676,10 +853,26 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
+       s390 | s390-*)
+               basic_machine=s390-ibm
+               ;;
+       s390x | s390x-*)
+               basic_machine=s390x-ibm
+               ;;
        sa29200)
                basic_machine=a29k-amd
                os=-udi
                ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
        sequent)
                basic_machine=i386-sequent
                ;;
@@ -687,7 +880,10 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sparclite-wrs)
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparclite-wrs | simso-wrs)
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
@@ -754,18 +950,42 @@ case $basic_machine in
                os=-dynix
                ;;
        t3e)
-               basic_machine=t3e-cray
+               basic_machine=alphaev5-cray
+               os=-unicos
+               ;;
+       t90)
+               basic_machine=t90-cray
                os=-unicos
                ;;
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff
+               ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
+               ;;
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
        tx39el)
                basic_machine=mipstx39el-unknown
                ;;
+       toad1)
+               basic_machine=pdp10-xkl
+               os=-tops20
+               ;;
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
        udi29k)
                basic_machine=a29k-amd
                os=-udi
@@ -787,8 +1007,8 @@ case $basic_machine in
                os=-vms
                ;;
        vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+               basic_machine=f301-fujitsu
+               ;;
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
@@ -809,13 +1029,13 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
-       xmp)
-               basic_machine=xmp-cray
-               os=-unicos
-               ;;
-        xps | xps100)
+       xps | xps100)
                basic_machine=xps100-honeywell
                ;;
+       ymp)
+               basic_machine=ymp-cray
+               os=-unicos
+               ;;
        z8k-*-coff)
                basic_machine=z8k-unknown
                os=-sim
@@ -836,13 +1056,6 @@ case $basic_machine in
        op60c)
                basic_machine=hppa1.1-oki
                ;;
-       mips)
-               if [ x$os = x-linux-gnu ]; then
-                       basic_machine=mips-unknown
-               else
-                       basic_machine=mips-mips
-               fi
-               ;;
        romp)
                basic_machine=romp-ibm
                ;;
@@ -852,16 +1065,26 @@ case $basic_machine in
        vax)
                basic_machine=vax-dec
                ;;
+       pdp10)
+               # there are many clones, so DEC is not a safe bet
+               basic_machine=pdp10-unknown
+               ;;
        pdp11)
                basic_machine=pdp11-dec
                ;;
        we32k)
                basic_machine=we32k-att
                ;;
-       sparc | sparcv9)
+       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+               basic_machine=sh-unknown
+               ;;
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparc | sparcv8 | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
-        cydra)
+       cydra)
                basic_machine=cydra-cydrome
                ;;
        orion)
@@ -876,9 +1099,8 @@ case $basic_machine in
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
+       *-unknown)
+               # Make sure to match an already-canonicalized machine name.
                ;;
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -932,27 +1154,35 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+             | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-             | -openstep* | -oskit*)
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
                case $basic_machine in
-                   x86-* | i[34567]86-*)
+                   x86-* | i*86-*)
                        ;;
                    *)
                        os=-nto$os
                        ;;
                esac
                ;;
+       -nto-qnx*)
+               ;;
        -nto*)
-               os=-nto-qnx
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -961,6 +1191,9 @@ case $os in
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
@@ -973,6 +1206,9 @@ case $os in
        -opened*)
                os=-openedition
                ;;
+        -os400*)
+               os=-os400
+               ;;
        -wince*)
                os=-wince
                ;;
@@ -991,16 +1227,25 @@ case $os in
        -acis*)
                os=-aos
                ;;
+       -atheos*)
+               os=-atheos
+               ;;
+       -syllable*)
+               os=-syllable
+               ;;
        -386bsd)
                os=-bsd
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;
+       -nova*)
+               os=-rtmk-nova
+               ;;
        -ns2 )
-               os=-nextstep2
+               os=-nextstep2
                ;;
-       -nsk)
+       -nsk*)
                os=-nsk
                ;;
        # Preserve the version number of sinix5.
@@ -1010,6 +1255,9 @@ case $os in
        -sinix*)
                os=-sysv4
                ;;
+        -tpf*)
+               os=-tpf
+               ;;
        -triton*)
                os=-sysv3
                ;;
@@ -1037,8 +1285,14 @@ case $os in
        -xenix)
                os=-xenix
                ;;
-        -*mint | -*MiNT)
-               os=-mint
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint
+               ;;
+       -aros*)
+               os=-aros
+               ;;
+       -kaos*)
+               os=-kaos
                ;;
        -none)
                ;;
@@ -1071,7 +1325,14 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-        pdp11-*)
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+       # This must come before the *-dec entry.
+       pdp10-*)
+               os=-tops20
+               ;;
+       pdp11-*)
                os=-none
                ;;
        *-dec | vax-*)
@@ -1098,6 +1359,9 @@ case $basic_machine in
        mips*-*)
                os=-elf
                ;;
+       or32-*)
+               os=-coff
+               ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
@@ -1161,25 +1425,25 @@ case $basic_machine in
        *-next)
                os=-nextstep3
                ;;
-        *-gould)
+       *-gould)
                os=-sysv
                ;;
-        *-highlevel)
+       *-highlevel)
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
-        *-sgi)
+       *-sgi)
                os=-irix
                ;;
-        *-siemens)
+       *-siemens)
                os=-sysv4
                ;;
        *-masscomp)
                os=-rtu
                ;;
-       f301-fujitsu)
+       f30[01]-fujitsu | f700-fujitsu)
                os=-uxpv
                ;;
        *-rom68k)
@@ -1242,10 +1506,16 @@ case $basic_machine in
                        -mvs* | -opened*)
                                vendor=ibm
                                ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
                        -ptx*)
                                vendor=sequent
                                ;;
-                       -vxsim* | -vxworks*)
+                       -tpf*)
+                               vendor=ibm
+                               ;;
+                       -vxsim* | -vxworks* | -windiss*)
                                vendor=wrs
                                ;;
                        -aux*)
@@ -1257,12 +1527,23 @@ case $basic_machine in
                        -mpw* | -macos*)
                                vendor=apple
                                ;;
-                       -*mint | -*MiNT)
+                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                vendor=atari
                                ;;
+                       -vos*)
+                               vendor=stratus
+                               ;;
                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;
 esac
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
index 251394b4d4e943fa4ae95c46e7108c4479d4c65f..6828dc0e08cbd0cf112dcbdfe338f1548a2e0239 100644 (file)
@@ -1,7 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+# NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# define SED for historic ltconfig's generated by Libtool 1.3
+test -z "$SED" && SED=sed
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.6
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)"
+
+
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
@@ -35,7 +62,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
 fi
 
 if test "X$1" = X--fallback-echo; then
@@ -44,19 +71,9 @@ if test "X$1" = X--fallback-echo; then
   cat <<EOF
 $*
 EOF
-  exit 0
+  exit $EXIT_SUCCESS
 fi
 
-# The name of this program.
-progname=`$echo "$0" | sed 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.3.5
-TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
-
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
@@ -66,10 +83,19 @@ rm="rm -f"
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed="${SED}"' -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
+# test EBCDIC or ASCII
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+  SP2NL="tr '\100' '\n'"
+  NL2SP="tr '\r\n' '\100\100'"
+  ;;
+ *) # Assume ASCII based system
+  SP2NL="tr '\040' '\012'"
+  NL2SP="tr '\015\012' '\040\040'"
+  ;;
+esac
 
 # NLS nuisances.
 # Only set LANG and LC_ALL to C if already set.
@@ -83,16 +109,14 @@ if test "${LANG+set}" = set; then
   save_LANG="$LANG"; LANG=C; export LANG
 fi
 
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
+# Make sure IFS has a sensible default
+: ${IFS="      
+"}
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  echo "$modename: not configured to build any kind of library" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit $EXIT_FAILURE
 fi
 
 # Global variables.
@@ -107,22 +131,173 @@ execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid () {
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 | \
+       sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+      if test "X$win32_nmres" = "Ximport" ; then
+        win32_libid_type="x86 archive import"
+      else
+        win32_libid_type="x86 archive static"
+      fi
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+       case $arg in
+         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+         arg="\"$arg\""
+         ;;
+       esac
+       CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+       for z in $available_tags; do
+         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+           # Evaluate the configuration.
+           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+           CC_quoted=
+           for arg in $CC; do
+           # Double-quote args containing other shell metacharacters.
+           case $arg in
+             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+             arg="\"$arg\""
+             ;;
+           esac
+           CC_quoted="$CC_quoted $arg"
+         done
+           case "$@ " in
+             " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+             # The compiler in the base compile command matches
+             # the one in the tagged configuration.
+             # Assume this is the tagged configuration we want.
+             tagname=$z
+             break
+             ;;
+           esac
+         fi
+       done
+       # If $tagname still isn't set, then no tagged configuration
+       # was found and let the user know that the "--tag" command
+       # line option must be used.
+       if test -z "$tagname"; then
+         $echo "$modename: unable to infer tagged configuration"
+         $echo "$modename: specify a tag with \`--tag'" 1>&2
+         exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+       fi
+       ;;
+      esac
+    fi
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+#eval std_shrext=\"$shrext_cmds\"
+
+# And fixing for Darwin sucks for everybody else
+if test -z "$shrext_cmds" && test -n "$shrext"; then
+       eval shrext_cmds=\"$shrext\"
+fi
+eval std_shrext=\"$shrext_cmds\"
+
+# This value is evaluated to 32768, so place it here as a compatilibity hack
+# because older libtool.m4 didn't define this variable
+test -z "$max_cmd_len" && max_cmd_len=32768
+
 # Parse our command line options once, thoroughly.
-while test $# -gt 0
+while test "$#" -gt 0
 do
   arg="$1"
   shift
 
-  case "$arg" in
+  case $arg in
   -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
   *) optarg= ;;
   esac
 
   # If the previous option needs an argument, assign it.
   if test -n "$prev"; then
-    case "$prev" in
+    case $prev in
     execute_dlfiles)
-      eval "$prev=\"\$$prev \$arg\""
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+       $echo "$progname: invalid tag name: $tagname" 1>&2
+       exit $EXIT_FAILURE
+       ;;
+      esac
+
+      case $tagname in
+      CC)
+       # Don't test for the "default" C tag, as we know, it's there, but
+       # not specially marked.
+       ;;
+      *)
+       if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+         taglist="$taglist $tagname"
+         # Evaluate the configuration.
+         eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+       else
+         $echo "$progname: ignoring unknown tag $tagname" 1>&2
+       fi
+       ;;
+      esac
       ;;
     *)
       eval "$prev=\$arg"
@@ -135,24 +310,33 @@ do
   fi
 
   # Have we seen a non-optional argument yet?
-  case "$arg" in
+  case $arg in
   --help)
     show_help=yes
     ;;
 
   --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    exit 0
+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $echo
+    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+    $echo "This is free software; see the source for copying conditions.  There is NO"
+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    exit $EXIT_SUCCESS
     ;;
 
   --config)
-    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
-    exit 0
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+    done
+    exit $EXIT_SUCCESS
     ;;
 
   --debug)
-    echo "$progname: enabling shell trace mode"
+    $echo "$progname: enabling shell trace mode"
     set -x
+    preserve_args="$preserve_args $arg"
     ;;
 
   --dry-run | -n)
@@ -160,18 +344,18 @@ do
     ;;
 
   --features)
-    echo "host: $host"
+    $echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      $echo "enable shared libraries"
     else
-      echo "disable shared libraries"
+      $echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      $echo "enable static libraries"
     else
-      echo "disable static libraries"
+      $echo "disable static libraries"
     fi
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   --finish) mode="finish" ;;
@@ -179,8 +363,19 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
   --quiet | --silent)
     show=:
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --tag) prevopt="--tag" prev=tag ;;
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    preserve_args="$preserve_args --tag"
     ;;
 
   -dlopen)
@@ -191,7 +386,7 @@ do
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
 
   *)
@@ -204,19 +399,26 @@ done
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
 if test -z "$show_help"; then
 
   # Infer the operation mode.
   if test -z "$mode"; then
-    case "$nonopt" in
-    *cc | *++ | gcc* | *-gcc*)
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
       mode=link
       for arg
       do
-       case "$arg" in
+       case $arg in
        -c)
           mode=compile
           break
@@ -253,7 +455,7 @@ if test -z "$show_help"; then
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
@@ -261,140 +463,222 @@ if test -z "$show_help"; then
   help="Try \`$modename --help --mode=$mode' for more information."
 
   # These modes are in order of execution frequency so that they run quickly.
-  case "$mode" in
+  case $mode in
   # libtool compile mode
   compile)
     modename="$modename: compile"
     # Get the compilation command and the source file.
     base_compile=
-    lastarg=
-    srcfile="$nonopt"
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
     suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
 
-    user_target=no
     for arg
     do
-      # Accept any command-line options.
-      case "$arg" in
-      -o)
-       if test "$user_target" != "no"; then
-         $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-         exit 1
-       fi
-       user_target=next
-       ;;
-
-      -static)
-       build_old_libs=yes
-       continue
+      case "$arg_mode" in
+      arg  )
+       # do not "continue".  Instead, add this to base_compile
+       lastarg="$arg"
+       arg_mode=normal
        ;;
-      esac
 
-      case "$user_target" in
-      next)
-       # The next one is the -o target name
-       user_target=yes
-       continue
-       ;;
-      yes)
-       # We got the output file
-       user_target=set
+      target )
        libobj="$arg"
+       arg_mode=normal
        continue
        ;;
-      esac
 
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
+      normal )
+       # Accept any command-line options.
+       case $arg in
+       -o)
+         if test -n "$libobj" ; then
+           $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+           exit $EXIT_FAILURE
+         fi
+         arg_mode=target
+         continue
+         ;;
 
-      # Aesthetically quote the previous argument.
+       -static | -prefer-pic | -prefer-non-pic)
+         later="$later $arg"
+         continue
+         ;;
+
+       -no-suppress)
+         suppress_opt=no
+         continue
+         ;;
+
+       -Xcompiler)
+         arg_mode=arg  #  the next one goes into the "base_compile" arg list
+         continue      #  The current "srcfile" will either be retained or
+         ;;            #  replaced later.  I would guess that would be a bug.
+
+       -Wc,*)
+         args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+         lastarg=
+         save_ifs="$IFS"; IFS=','
+         for arg in $args; do
+           IFS="$save_ifs"
+
+           # Double-quote args containing other shell metacharacters.
+           # Many Bourne shells cannot handle close brackets correctly
+           # in scan sets, so we specify it separately.
+           case $arg in
+             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+             arg="\"$arg\""
+             ;;
+           esac
+           lastarg="$lastarg $arg"
+         done
+         IFS="$save_ifs"
+         lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
 
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
+         # Add the arguments to base_compile.
+         base_compile="$base_compile $lastarg"
+         continue
+         ;;
+
+       * )
+         # Accept the current argument as the source file.
+         # The previous "srcfile" becomes the current argument.
+         #
+         lastarg="$srcfile"
+         srcfile="$arg"
+         ;;
+       esac  #  case $arg
+       ;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
 
+      case $lastarg in
       # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly in scan
-      # sets, so we specify it separately.
-      case "$lastarg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*)
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
        lastarg="\"$lastarg\""
        ;;
       esac
 
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-       base_compile="$lastarg"
-      else
-       base_compile="$base_compile $lastarg"
-      fi
-    done
+      base_compile="$base_compile $lastarg"
+    done # for arg
 
-    case "$user_target" in
-    set)
+    case $arg_mode in
+    arg)
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit $EXIT_FAILURE
       ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+    target)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit $EXIT_FAILURE
       ;;
     *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
+      # Get the name of the library object.
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
-    case "$libobj" in
+    xform='[cCFSifmso]'
+    case $libobj in
     *.ada) xform=ada ;;
     *.adb) xform=adb ;;
     *.ads) xform=ads ;;
     *.asm) xform=asm ;;
     *.c++) xform=c++ ;;
     *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
+    *.java) xform=java ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
 
-    case "$libobj" in
+    case $libobj in
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     esac
 
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -static)
+       build_old_libs=yes
+       continue
+       ;;
+
+      -prefer-pic)
+       pic_mode=yes
+       continue
+       ;;
+
+      -prefer-non-pic)
+       pic_mode=no
+       continue
+       ;;
+      esac
+    done
+
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
-      removelist="$obj $libobj"
+      removelist="$obj $lobj $libobj ${libobj}T"
     else
-      removelist="$libobj"
+      removelist="$lobj $libobj ${libobj}T"
     fi
 
     $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
+      output_obj=
       need_locks=no
       lockfile=
     fi
@@ -402,13 +686,13 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until ln "$0" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
        $show "Waiting for $lockfile to be removed"
        sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-       echo "\
+       $echo "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -420,63 +704,67 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
-       exit 1
+       exit $EXIT_FAILURE
       fi
-      echo $srcfile > "$lockfile"
+      $echo $srcfile > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
 
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      # All platforms use -DPIC, to notify preprocessed assembler code.
-      command="$base_compile $srcfile $pic_flag -DPIC"
-      if test "$build_old_libs" = yes; then
-       lo_libobj="$libobj"
-       dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-       if test "X$dir" = "X$libobj"; then
-         dir="$objdir"
-       else
-         dir="$dir/$objdir"
-       fi
-       libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+      if test "$pic_mode" != no; then
+       command="$base_compile $srcfile $pic_flag"
+      else
+       # Don't build PIC code
+       command="$base_compile $srcfile"
+      fi
 
-       if test -d "$dir"; then
-         $show "$rm $libobj"
-         $run $rm $libobj
-       else
-         $show "$mkdir $dir"
-         $run $mkdir $dir
-         status=$?
-         if test $status -ne 0 && test ! -d $dir; then
-           exit $status
-         fi
+      if test ! -d "${xdir}$objdir"; then
+       $show "$mkdir ${xdir}$objdir"
+       $run $mkdir ${xdir}$objdir
+       status=$?
+       if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+         exit $status
        fi
       fi
-      if test "$compiler_o_lo" = yes; then
-       output_obj="$libobj"
-       command="$command -o $output_obj"
-      elif test "$compiler_c_o" = yes; then
-       output_obj="$obj"
-       command="$command -o $output_obj"
+
+      if test -z "$output_obj"; then
+       # Place PIC objects in $objdir
+       command="$command -o $lobj"
       fi
 
-      $run $rm "$output_obj"
+      $run $rm "$lobj" "$output_obj"
+
       $show "$command"
       if $run eval "$command"; then :
       else
        test -n "$output_obj" && $run $rm $removelist
-       exit 1
+       exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
-        test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-       echo "\
+        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+       $echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -491,13 +779,13 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
-       exit 1
+       exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
-      if test x"$output_obj" != x"$libobj"; then
-       $show "$mv $output_obj $libobj"
-       if $run $mv $output_obj $libobj; then :
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+       $show "$mv $output_obj $lobj"
+       if $run $mv $output_obj $lobj; then :
        else
          error=$?
          $run $rm $removelist
@@ -505,66 +793,50 @@ compiler."
        fi
       fi
 
-      # If we have no pic_flag, then copy the object into place and finish.
-      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
-       # Rename the .lo from within objdir to obj
-       if test -f $obj; then
-         $show $rm $obj
-         $run $rm $obj
-       fi
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
 
-       $show "$mv $libobj $obj"
-       if $run $mv $libobj $obj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
+EOF
 
-       xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-       if test "X$xdir" = "X$obj"; then
-         xdir="."
-       else
-         xdir="$xdir"
-       fi
-       baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-       libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-       # Now arrange that obj and lo_libobj become the same file
-       $show "(cd $xdir && $LN_S $baseobj $libobj)"
-       if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-         exit 0
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+        suppress_output=' >/dev/null 2>&1'
       fi
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
 
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
+EOF
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
-      command="$base_compile $srcfile"
+      if test "$pic_mode" != yes; then
+       # Don't build PIC code
+       command="$base_compile $srcfile"
+      else
+       command="$base_compile $srcfile $pic_flag"
+      fi
       if test "$compiler_c_o" = yes; then
        command="$command -o $obj"
-       output_obj="$obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
-      $run $rm "$output_obj"
+      $run $rm "$obj" "$output_obj"
       $show "$command"
       if $run eval "$command"; then :
       else
        $run $rm $removelist
-       exit 1
+       exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
-        test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-       echo "\
+        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+       $echo "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -579,11 +851,11 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
        $run $rm $removelist
-       exit 1
+       exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
-      if test x"$output_obj" != x"$obj"; then
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
        $show "$mv $output_obj $obj"
        if $run $mv $output_obj $obj; then :
        else
@@ -593,40 +865,42 @@ compiler."
        fi
       fi
 
-      # Create an invalid libtool object if no PIC, so that we do not
-      # accidentally link it into a program.
-      if test "$build_libtool_libs" != yes; then
-       $show "echo timestamp > $libobj"
-       $run eval "echo timestamp > \$libobj" || exit $?
-      else
-       # Move the .lo from within objdir
-       $show "$mv $libobj $lo_libobj"
-       if $run $mv $libobj $lo_libobj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
-      fi
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
     fi
 
+    $run $mv "${libobj}T" "${libobj}"
+
     # Unlock the critical section if it was locked
     if test "$need_locks" != no; then
-      $rm "$lockfile"
+      $run $rm "$lockfile"
     fi
 
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool link mode
-  link)
+  link | relink)
     modename="$modename: link"
-    case "$host" in
-    *-*-cygwin* | *-*-mingw* | *-*-os2*)
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
-      # flag for every libtool invokation.
+      # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
@@ -635,179 +909,13 @@ compiler."
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
       allow_undefined=yes
-
-      # This is a source program that is used to create dlls on Windows
-      # Don't remove nor modify the starting and closing comments
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-      # This is a source program that is used to create import libraries
-      # on Windows for dlls which lack them. Don't remove nor modify the
-      # starting and closing comments
-# /* impgen.c starts here */
-# /*   Copyright (C) 1999 Free Software Foundation, Inc.
-# 
-#  This file is part of GNU libtool.
-# 
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#  */
-# 
-#  #include <stdio.h>          /* for printf() */
-#  #include <unistd.h>         /* for open(), lseek(), read() */
-#  #include <fcntl.h>          /* for O_RDONLY, O_BINARY */
-#  #include <string.h>         /* for strdup() */
-# 
-#  static unsigned int
-#  pe_get16 (fd, offset)
-#       int fd;
-#       int offset;
-#  {
-#    unsigned char b[2];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 2);
-#    return b[0] + (b[1]<<8);
-#  }
-# 
-#  static unsigned int
-#  pe_get32 (fd, offset)
-#      int fd;
-#      int offset;
-#  {
-#    unsigned char b[4];
-#    lseek (fd, offset, SEEK_SET);
-#    read (fd, b, 4);
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-# 
-#  static unsigned int
-#  pe_as32 (ptr)
-#       void *ptr;
-#  {
-#    unsigned char *b = ptr;
-#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-#  }
-# 
-#  int
-#  main (argc, argv)
-#      int argc;
-#      char *argv[];
-#  {
-#      int dll;
-#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-#      unsigned long export_rva, export_size, nsections, secptr, expptr;
-#      unsigned long name_rvas, nexp;
-#      unsigned char *expdata, *erva;
-#      char *filename, *dll_name;
-# 
-#      filename = argv[1];
-# 
-#      dll = open(filename, O_RDONLY|O_BINARY);
-#      if (!dll)
-#      return 1;
-# 
-#      dll_name = filename;
-#    
-#      for (i=0; filename[i]; i++)
-#      if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-#          dll_name = filename + i +1;
-# 
-#      pe_header_offset = pe_get32 (dll, 0x3c);
-#      opthdr_ofs = pe_header_offset + 4 + 20;
-#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
-# 
-#      if (num_entries < 1) /* no exports */
-#      return 1;
-# 
-#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
-#      export_size = pe_get32 (dll, opthdr_ofs + 100);
-#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-#      secptr = (pe_header_offset + 4 + 20 +
-#            pe_get16 (dll, pe_header_offset + 4 + 16));
-# 
-#      expptr = 0;
-#      for (i = 0; i < nsections; i++)
-#      {
-#      char sname[8];
-#      unsigned long secptr1 = secptr + 40 * i;
-#      unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-#      unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-#      unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-#      lseek(dll, secptr1, SEEK_SET);
-#      read(dll, sname, 8);
-#      if (vaddr <= export_rva && vaddr+vsize > export_rva)
-#      {
-#          expptr = fptr + (export_rva - vaddr);
-#          if (export_rva + export_size > vaddr + vsize)
-#              export_size = vsize - (export_rva - vaddr);
-#          break;
-#      }
-#      }
-# 
-#      expdata = (unsigned char*)malloc(export_size);
-#      lseek (dll, expptr, SEEK_SET);
-#      read (dll, expdata, export_size);
-#      erva = expdata - export_rva;
-# 
-#      nexp = pe_as32 (expdata+24);
-#      name_rvas = pe_as32 (expdata+32);
-# 
-#      printf ("EXPORTS\n");
-#      for (i = 0; i<nexp; i++)
-#      {
-#      unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-#      printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-#      }
-# 
-#      return 0;
-#  }
-# /* impgen.c ends here */
       ;;
     *)
       allow_undefined=yes
       ;;
     esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt $@"
     compile_command="$nonopt"
     finalize_command="$nonopt"
 
@@ -818,18 +926,13 @@ compiler."
     convenience=
     old_convenience=
     deplibs=
-    linkopts=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
 
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      lib_search_path=
-    fi
-    # now prepend the system-specific ones
-    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-    
     avoid_version=no
     dlfiles=
     dlprefiles=
@@ -839,10 +942,12 @@ compiler."
     export_symbols_regex=
     generated=
     libobjs=
-    link_against_libtool_libs=
     ltlibs=
     module=no
+    no_install=no
     objs=
+    non_pic_objects=
+    precious_files_regex=
     prefer_static_libs=no
     preload=no
     prev=
@@ -854,11 +959,14 @@ compiler."
     temp_rpath=
     thread_safe=no
     vinfo=
+    vinfo_number=no
+
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
     do
-      case "$arg" in
+      case $arg in
       -all-static | -static)
        if test "X$arg" = "X-all-static"; then
          if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
@@ -884,20 +992,27 @@ compiler."
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
     # Go through the arguments, transforming them on the way.
-    while test $# -gt 0; do
+    while test "$#" -gt 0; do
       arg="$1"
       shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
+       qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+       ;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
-       case "$prev" in
+       case $prev in
        output)
          compile_command="$compile_command @OUTPUT@"
          finalize_command="$finalize_command @OUTPUT@"
          ;;
        esac
 
-       case "$prev" in
+       case $prev in
        dlfiles|dlprefiles)
          if test "$preload" = no; then
            # Add the symbol object into the linking commands.
@@ -905,7 +1020,7 @@ compiler."
            finalize_command="$finalize_command @SYMFILE@"
            preload=yes
          fi
-         case "$arg" in
+         case $arg in
          *.la | *.lo) ;;  # We handle these cases below.
          force)
            if test "$dlself" = no; then
@@ -934,6 +1049,7 @@ compiler."
              dlprefiles="$dlprefiles $arg"
            fi
            prev=
+           continue
            ;;
          esac
          ;;
@@ -941,7 +1057,7 @@ compiler."
          export_symbols="$arg"
          if test ! -f "$arg"; then
            $echo "$modename: symbol file \`$arg' does not exist"
-           exit 1
+           exit $EXIT_FAILURE
          fi
          prev=
          continue
@@ -951,18 +1067,135 @@ compiler."
          prev=
          continue
          ;;
+       inst_prefix)
+         inst_prefix_dir="$arg"
+         prev=
+         continue
+         ;;
+       precious_regex)
+         precious_files_regex="$arg"
+         prev=
+         continue
+         ;;
        release)
          release="-$arg"
          prev=
          continue
          ;;
+       objectlist)
+         if test -f "$arg"; then
+           save_arg=$arg
+           moreargs=
+           for fil in `cat $save_arg`
+           do
+#            moreargs="$moreargs $fil"
+             arg=$fil
+             # A libtool-controlled object.
+
+             # Check to see that this really is a libtool object.
+             if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+               pic_object=
+               non_pic_object=
+
+               # Read the .lo file
+               # If there is no directory component, then add one.
+               case $arg in
+               */* | *\\*) . $arg ;;
+               *) . ./$arg ;;
+               esac
+
+               if test -z "$pic_object" || \
+                  test -z "$non_pic_object" ||
+                  test "$pic_object" = none && \
+                  test "$non_pic_object" = none; then
+                 $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+                 exit $EXIT_FAILURE
+               fi
+
+               # Extract subdirectory from the argument.
+               xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+               if test "X$xdir" = "X$arg"; then
+                 xdir=
+               else
+                 xdir="$xdir/"
+               fi
+
+               if test "$pic_object" != none; then
+                 # Prepend the subdirectory the object is found in.
+                 pic_object="$xdir$pic_object"
+
+                 if test "$prev" = dlfiles; then
+                   if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+                     dlfiles="$dlfiles $pic_object"
+                     prev=
+                     continue
+                   else
+                     # If libtool objects are unsupported, then we need to preload.
+                     prev=dlprefiles
+                   fi
+                 fi
+
+                 # CHECK ME:  I think I busted this.  -Ossama
+                 if test "$prev" = dlprefiles; then
+                   # Preload the old-style object.
+                   dlprefiles="$dlprefiles $pic_object"
+                   prev=
+                 fi
+
+                 # A PIC object.
+                 libobjs="$libobjs $pic_object"
+                 arg="$pic_object"
+               fi
+
+               # Non-PIC object.
+               if test "$non_pic_object" != none; then
+                 # Prepend the subdirectory the object is found in.
+                 non_pic_object="$xdir$non_pic_object"
+
+                 # A standard non-PIC object
+                 non_pic_objects="$non_pic_objects $non_pic_object"
+                 if test -z "$pic_object" || test "$pic_object" = none ; then
+                   arg="$non_pic_object"
+                 fi
+               fi
+             else
+               # Only an error if not doing a dry-run.
+               if test -z "$run"; then
+                 $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+                 exit $EXIT_FAILURE
+               else
+                 # Dry-run case.
+
+                 # Extract subdirectory from the argument.
+                 xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+                 if test "X$xdir" = "X$arg"; then
+                   xdir=
+                 else
+                   xdir="$xdir/"
+                 fi
+
+                 pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+                 non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+                 libobjs="$libobjs $pic_object"
+                 non_pic_objects="$non_pic_objects $non_pic_object"
+               fi
+             fi
+           done
+         else
+           $echo "$modename: link input file \`$save_arg' does not exist"
+           exit $EXIT_FAILURE
+         fi
+         arg=$save_arg
+         prev=
+         continue
+         ;;
        rpath | xrpath)
          # We need an absolute path.
-         case "$arg" in
+         case $arg in
          [\\/]* | [A-Za-z]:[\\/]*) ;;
          *)
            $echo "$modename: only absolute run-paths are allowed" 1>&2
-           exit 1
+           exit $EXIT_FAILURE
            ;;
          esac
          if test "$prev" = rpath; then
@@ -979,17 +1212,45 @@ compiler."
          prev=
          continue
          ;;
+       xcompiler)
+         compiler_flags="$compiler_flags $qarg"
+         prev=
+         compile_command="$compile_command $qarg"
+         finalize_command="$finalize_command $qarg"
+         continue
+         ;;
+       xlinker)
+         linker_flags="$linker_flags $qarg"
+         compiler_flags="$compiler_flags $wl$qarg"
+         prev=
+         compile_command="$compile_command $wl$qarg"
+         finalize_command="$finalize_command $wl$qarg"
+         continue
+         ;;
+       xcclinker)
+         linker_flags="$linker_flags $qarg"
+         compiler_flags="$compiler_flags $qarg"
+         prev=
+         compile_command="$compile_command $qarg"
+         finalize_command="$finalize_command $qarg"
+         continue
+         ;;
+       shrext)
+         shrext_cmds="$arg"
+         prev=
+         continue
+         ;;
        *)
          eval "$prev=\"\$arg\""
          prev=
          continue
          ;;
        esac
-      fi
+      fi # test -n "$prev"
 
       prevarg="$arg"
 
-      case "$arg" in
+      case $arg in
       -all-static)
        if test -n "$link_static_flag"; then
          compile_command="$compile_command $link_static_flag"
@@ -1026,8 +1287,8 @@ compiler."
 
       -export-symbols | -export-symbols-regex)
        if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-         $echo "$modename: not more than one -exported-symbols argument allowed"
-         exit 1
+         $echo "$modename: more than one -exported-symbols argument is not allowed"
+         exit $EXIT_FAILURE
        fi
        if test "X$arg" = "X-export-symbols"; then
          prev=expsyms
@@ -1037,58 +1298,90 @@ compiler."
        continue
        ;;
 
+      -inst-prefix-dir)
+       prev=inst_prefix
+       continue
+       ;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+       case $with_gcc/$host in
+       no/*-*-irix* | /*-*-irix*)
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+         ;;
+       esac
+       continue
+       ;;
+
       -L*)
        dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
        # We need an absolute path.
-       case "$dir" in
+       case $dir in
        [\\/]* | [A-Za-z]:[\\/]*) ;;
        *)
          absdir=`cd "$dir" && pwd`
          if test -z "$absdir"; then
-           $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-           $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-           absdir="$dir"
+           $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+           exit $EXIT_FAILURE
          fi
          dir="$absdir"
          ;;
        esac
-       case " $deplibs " in
-       *" $arg "*) ;;
-       *) deplibs="$deplibs $arg";;
-       esac
-       case " $lib_search_path " in
-       *" $dir "*) ;;
-       *) lib_search_path="$lib_search_path $dir";;
+       case "$deplibs " in
+       *" -L$dir "*) ;;
+       *)
+         deplibs="$deplibs -L$dir"
+         lib_search_path="$lib_search_path $dir"
+         ;;
        esac
-       case "$host" in
-       *-*-cygwin* | *-*-mingw* | *-*-os2*)
-         dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
-         case ":$dllsearchpath:" in
-         ::) dllsearchpath="$dllsearchdir";;
-         *":$dllsearchdir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+         case :$dllsearchpath: in
+         *":$dir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$dir";;
          esac
          ;;
        esac
+       continue
        ;;
 
       -l*)
-       if test "$arg" = "-lc"; then
-         case "$host" in
-         *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
-           # These systems don't actually have c library (as such)
+       if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+         case $host in
+         *-*-cygwin* | *-*-pw32* | *-*-beos*)
+           # These systems don't actually have a C or math library (as such)
            continue
            ;;
-         esac
-       elif test "$arg" = "-lm"; then
-         case "$host" in
-         *-*-cygwin* | *-*-beos*)
-           # These systems don't actually have math library (as such)
-           continue
+         *-*-mingw* | *-*-os2*)
+           # These systems don't actually have a C library (as such)
+           test "X$arg" = "X-lc" && continue
+           ;;
+         *-*-openbsd* | *-*-freebsd*)
+           # Do not include libc due to us having libc/libc_r.
+           test "X$arg" = "X-lc" && continue
            ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C and math libraries are in the System framework
+           deplibs="$deplibs -framework System"
+           continue
          esac
+       elif test "X$arg" = "X-lc_r"; then
+        case $host in
+        *-*-openbsd* | *-*-freebsd*)
+          # Do not include libc_r directly, use -pthread flag.
+          continue
+          ;;
+        esac
        fi
        deplibs="$deplibs $arg"
+       continue
+       ;;
+
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+       deplibs="$deplibs $arg"
+       continue
        ;;
 
       -module)
@@ -1096,13 +1389,70 @@ compiler."
        continue
        ;;
 
+      # gcc -m* arguments should be passed to the linker via $compiler_flags
+      # in order to pass architecture information to the linker
+      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+      # but this is not reliable with gcc because gcc may use -mfoo to
+      # select a different linker, different libraries, etc, while
+      # -Wl,-mfoo simply passes -mfoo to the linker.
+      -m*)
+       # Unknown arguments in both finalize_command and compile_command need
+       # to be aesthetically quoted because they are evaled later.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
+         arg="\"$arg\""
+         ;;
+       esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        if test "$with_gcc" = "yes" ; then
+          compiler_flags="$compiler_flags $arg"
+        fi
+        continue
+        ;;
+
+      -shrext)
+       prev=shrext
+       continue
+       ;;
+
+      -no-fast-install)
+       fast_install=no
+       continue
+       ;;
+
+      -no-install)
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+         # The PATH hackery in wrapper scripts is required on Windows
+         # in order for the loader to find any dlls it needs.
+         $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+         $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+         fast_install=no
+         ;;
+       *) no_install=yes ;;
+       esac
+       continue
+       ;;
+
       -no-undefined)
        allow_undefined=no
        continue
        ;;
 
+      -objectlist)
+       prev=objectlist
+       continue
+       ;;
+
       -o) prev=output ;;
 
+      -precious-files-regex)
+       prev=precious_regex
+       continue
+       ;;
+
       -release)
        prev=release
        continue
@@ -1121,11 +1471,11 @@ compiler."
       -R*)
        dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
        # We need an absolute path.
-       case "$dir" in
+       case $dir in
        [\\/]* | [A-Za-z]:[\\/]*) ;;
        *)
          $echo "$modename: only absolute run-paths are allowed" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
        case "$xrpath " in
@@ -1136,11 +1486,11 @@ compiler."
        ;;
 
       -static)
-       # If we have no pic_flag, then this is the same as -all-static.
-       if test -z "$pic_flag" && test -n "$link_static_flag"; then
-         compile_command="$compile_command $link_static_flag"
-         finalize_command="$finalize_command $link_static_flag"
-       fi
+       # The effects of -static are defined in a previous loop.
+       # We used to do the same as -all-static on platforms that
+       # didn't have a PIC flag, but the assumption that the effects
+       # would be equivalent was wrong.  It would break on at least
+       # Digital Unix and AIX.
        continue
        ;;
 
@@ -1153,388 +1503,1301 @@ compiler."
        prev=vinfo
        continue
        ;;
+      -version-number)
+       prev=vinfo
+       vinfo_number=yes
+       continue
+       ;;
+
+      -Wc,*)
+       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+       arg=
+       save_ifs="$IFS"; IFS=','
+       for flag in $args; do
+         IFS="$save_ifs"
+         case $flag in
+           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
+           flag="\"$flag\""
+           ;;
+         esac
+         arg="$arg $wl$flag"
+         compiler_flags="$compiler_flags $flag"
+       done
+       IFS="$save_ifs"
+       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+       ;;
+
+      -Wl,*)
+       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+       arg=
+       save_ifs="$IFS"; IFS=','
+       for flag in $args; do
+         IFS="$save_ifs"
+         case $flag in
+           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
+           flag="\"$flag\""
+           ;;
+         esac
+         arg="$arg $wl$flag"
+         compiler_flags="$compiler_flags $wl$flag"
+         linker_flags="$linker_flags $flag"
+       done
+       IFS="$save_ifs"
+       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+       ;;
+
+      -Xcompiler)
+       prev=xcompiler
+       continue
+       ;;
+
+      -Xlinker)
+       prev=xlinker
+       continue
+       ;;
+
+      -XCClinker)
+       prev=xcclinker
+       continue
+       ;;
 
       # Some other compiler flag.
       -* | +*)
        # Unknown arguments in both finalize_command and compile_command need
        # to be aesthetically quoted because they are evaled later.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case "$arg" in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*)
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
          arg="\"$arg\""
          ;;
        esac
        ;;
 
-      *.o | *.obj | *.a | *.lib)
+      *.$objext)
        # A standard object.
        objs="$objs $arg"
        ;;
 
       *.lo)
-       # A library object.
-       if test "$prev" = dlfiles; then
-         dlfiles="$dlfiles $arg"
-         if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then
-           prev=
-           continue
+       # A libtool-controlled object.
+
+       # Check to see that this really is a libtool object.
+       if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+         pic_object=
+         non_pic_object=
+
+         # Read the .lo file
+         # If there is no directory component, then add one.
+         case $arg in
+         */* | *\\*) . $arg ;;
+         *) . ./$arg ;;
+         esac
+
+         if test -z "$pic_object" || \
+            test -z "$non_pic_object" ||
+            test "$pic_object" = none && \
+            test "$non_pic_object" = none; then
+           $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+           exit $EXIT_FAILURE
+         fi
+
+         # Extract subdirectory from the argument.
+         xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+         if test "X$xdir" = "X$arg"; then
+           xdir=
+         else
+           xdir="$xdir/"
+         fi
+
+         if test "$pic_object" != none; then
+           # Prepend the subdirectory the object is found in.
+           pic_object="$xdir$pic_object"
+
+           if test "$prev" = dlfiles; then
+             if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+               dlfiles="$dlfiles $pic_object"
+               prev=
+               continue
+             else
+               # If libtool objects are unsupported, then we need to preload.
+               prev=dlprefiles
+             fi
+           fi
+
+           # CHECK ME:  I think I busted this.  -Ossama
+           if test "$prev" = dlprefiles; then
+             # Preload the old-style object.
+             dlprefiles="$dlprefiles $pic_object"
+             prev=
+           fi
+
+           # A PIC object.
+           libobjs="$libobjs $pic_object"
+           arg="$pic_object"
+         fi
+
+         # Non-PIC object.
+         if test "$non_pic_object" != none; then
+           # Prepend the subdirectory the object is found in.
+           non_pic_object="$xdir$non_pic_object"
+
+           # A standard non-PIC object
+           non_pic_objects="$non_pic_objects $non_pic_object"
+           if test -z "$pic_object" || test "$pic_object" = none ; then
+             arg="$non_pic_object"
+           fi
+         fi
+       else
+         # Only an error if not doing a dry-run.
+         if test -z "$run"; then
+           $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+           exit $EXIT_FAILURE
          else
-           # If libtool objects are unsupported, then we need to preload.
-           prev=dlprefiles
+           # Dry-run case.
+
+           # Extract subdirectory from the argument.
+           xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+           if test "X$xdir" = "X$arg"; then
+             xdir=
+           else
+             xdir="$xdir/"
+           fi
+
+           pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+           non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+           libobjs="$libobjs $pic_object"
+           non_pic_objects="$non_pic_objects $non_pic_object"
          fi
        fi
+       ;;
 
-       if test "$prev" = dlprefiles; then
-         # Preload the old-style object.
-         dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-         prev=
-       fi
-       libobjs="$libobjs $arg"
+      *.$libext)
+       # An archive.
+       deplibs="$deplibs $arg"
+       old_deplibs="$old_deplibs $arg"
+       continue
        ;;
 
       *.la)
        # A libtool-controlled library.
 
-       dlname=
-       libdir=
-       library_names=
-       old_library=
+       if test "$prev" = dlfiles; then
+         # This library was specified with -dlopen.
+         dlfiles="$dlfiles $arg"
+         prev=
+       elif test "$prev" = dlprefiles; then
+         # The library was specified with -dlpreopen.
+         dlprefiles="$dlprefiles $arg"
+         prev=
+       else
+         deplibs="$deplibs $arg"
+       fi
+       continue
+       ;;
+
+      # Some other compiler argument.
+      *)
+       # Unknown arguments in both finalize_command and compile_command need
+       # to be aesthetically quoted because they are evaled later.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
+         arg="\"$arg\""
+         ;;
+       esac
+       ;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+       compile_command="$compile_command $arg"
+       finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      status=$?
+      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+       exit $status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplications in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+       case "$libs " in
+       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+       esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+       for pre_post_dep in $predeps $postdeps; do
+         case "$pre_post_deps " in
+         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+         esac
+         pre_post_deps="$pre_post_deps $pre_post_dep"
+       done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+    case $linkmode in
+    lib)
+       passes="conv link"
+       for file in $dlfiles $dlprefiles; do
+         case $file in
+         *.la) ;;
+         *)
+           $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+           exit $EXIT_FAILURE
+           ;;
+         esac
+       done
+       ;;
+    prog)
+       compile_deplibs=
+       finalize_deplibs=
+       alldeplibs=no
+       newdlfiles=
+       newdlprefiles=
+       passes="conv scan dlopen dlpreopen link"
+       ;;
+    *)  passes="conv"
+       ;;
+    esac
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+        test "$linkmode,$pass" = "prog,scan"; then
+       libs="$deplibs"
+       deplibs=
+      fi
+      if test "$linkmode" = prog; then
+       case $pass in
+       dlopen) libs="$dlfiles" ;;
+       dlpreopen) libs="$dlprefiles" ;;
+       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       esac
+      fi
+      if test "$pass" = dlopen; then
+       # Collect dlpreopened libraries
+       save_deplibs="$deplibs"
+       deplibs=
+      fi
+      for deplib in $libs; do
+       lib=
+       found=no
+       case $deplib in
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+         fi
+         continue
+         ;;
+       -l*)
+         if test "$linkmode" != lib && test "$linkmode" != prog; then
+           $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+           continue
+         fi
+         if test "$pass" = conv; then
+           deplibs="$deplib $deplibs"
+           continue
+         fi
+         name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+         for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+           for search_ext in .la $std_shrext .so .a; do
+             # Search the libtool library
+             lib="$searchdir/lib${name}${search_ext}"
+             if test -f "$lib"; then
+               if test "$search_ext" = ".la"; then
+                 found=yes
+               else
+                 found=no
+               fi
+               break 2
+             fi
+           done
+         done
+         if test "$found" != yes; then
+           # deplib doesn't seem to be a libtool library
+           if test "$linkmode,$pass" = "prog,link"; then
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             deplibs="$deplib $deplibs"
+             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+           fi
+           continue
+         else # deplib is a libtool library
+           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+           # We need to do some special things here, and not later.
+           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+             case " $predeps $postdeps " in
+             *" $deplib "*)
+               if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+                 library_names=
+                 old_library=
+                 case $lib in
+                 */* | *\\*) . $lib ;;
+                 *) . ./$lib ;;
+                 esac
+                 for l in $old_library $library_names; do
+                   ll="$l"
+                 done
+                 if test "X$ll" = "X$old_library" ; then # only static version available
+                   found=no
+                   ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+                   test "X$ladir" = "X$lib" && ladir="."
+                   lib=$ladir/$old_library
+                   if test "$linkmode,$pass" = "prog,link"; then
+                     compile_deplibs="$deplib $compile_deplibs"
+                     finalize_deplibs="$deplib $finalize_deplibs"
+                   else
+                     deplibs="$deplib $deplibs"
+                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+                   fi
+                   continue
+                 fi
+               fi
+               ;;
+             *) ;;
+             esac
+           fi
+         fi
+         ;; # -l
+       -L*)
+         case $linkmode in
+         lib)
+           deplibs="$deplib $deplibs"
+           test "$pass" = conv && continue
+           newdependency_libs="$deplib $newdependency_libs"
+           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+           ;;
+         prog)
+           if test "$pass" = conv; then
+             deplibs="$deplib $deplibs"
+             continue
+           fi
+           if test "$pass" = scan; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+           ;;
+         *)
+           $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+           ;;
+         esac # linkmode
+         continue
+         ;; # -L
+       -R*)
+         if test "$pass" = link; then
+           dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+           # Make sure the xrpath contains only unique directories.
+           case "$xrpath " in
+           *" $dir "*) ;;
+           *) xrpath="$xrpath $dir" ;;
+           esac
+         fi
+         deplibs="$deplib $deplibs"
+         continue
+         ;;
+       *.la) lib="$deplib" ;;
+       *.$libext)
+         if test "$pass" = conv; then
+           deplibs="$deplib $deplibs"
+           continue
+         fi
+         case $linkmode in
+         lib)
+           if test "$deplibs_check_method" != pass_all; then
+             $echo
+             $echo "*** Warning: Trying to link with static lib archive $deplib."
+             $echo "*** I have the capability to make that library automatically link in when"
+             $echo "*** you link to this library.  But I can only do this if you have a"
+             $echo "*** shared version of the library, which you do not appear to have"
+             $echo "*** because the file extensions .$libext of this argument makes me believe"
+             $echo "*** that it is just a static archive that I should not used here."
+           else
+             $echo
+             $echo "*** Warning: Linking the shared library $output against the"
+             $echo "*** static library $deplib is not portable!"
+             deplibs="$deplib $deplibs"
+           fi
+           continue
+           ;;
+         prog)
+           if test "$pass" != link; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           continue
+           ;;
+         esac # linkmode
+         ;; # *.$libext
+       *.lo | *.$objext)
+         if test "$pass" = conv; then
+           deplibs="$deplib $deplibs"
+         elif test "$linkmode" = prog; then
+           if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+             # If there is no dlopen support or we're linking statically,
+             # we need to preload.
+             newdlprefiles="$newdlprefiles $deplib"
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             newdlfiles="$newdlfiles $deplib"
+           fi
+         fi
+         continue
+         ;;
+       %DEPLIBS%)
+         alldeplibs=yes
+         continue
+         ;;
+       esac # case $deplib
+       if test "$found" = yes || test -f "$lib"; then :
+       else
+         $echo "$modename: cannot find the library \`$lib'" 1>&2
+         exit $EXIT_FAILURE
+       fi
 
        # Check to see that this really is a libtool archive.
-       if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+       if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
        else
-         $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
-         exit 1
+         $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+         exit $EXIT_FAILURE
        fi
 
+       ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+       test "X$ladir" = "X$lib" && ladir="."
+
+       dlname=
+       dlopen=
+       dlpreopen=
+       libdir=
+       library_names=
+       old_library=
        # If the library was installed with an old release of libtool,
-       # it will not redefine variable installed.
+       # it will not redefine variables installed, or shouldnotlink
        installed=yes
+       shouldnotlink=no
 
        # Read the .la file
-       # If there is no directory component, then add one.
-       case "$arg" in
-       */* | *\\*) . $arg ;;
-       *) . ./$arg ;;
+       case $lib in
+       */* | *\\*) . $lib ;;
+       *) . ./$lib ;;
        esac
 
+       if test "$linkmode,$pass" = "lib,link" ||
+          test "$linkmode,$pass" = "prog,scan" ||
+          { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+       fi
+
+       if test "$pass" = conv; then
+         # Only check for convenience libraries
+         deplibs="$lib $deplibs"
+         if test -z "$libdir"; then
+           if test -z "$old_library"; then
+             $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+             exit $EXIT_FAILURE
+           fi
+           # It is a libtool convenience library, so add in its objects.
+           convenience="$convenience $ladir/$objdir/$old_library"
+           old_convenience="$old_convenience $ladir/$objdir/$old_library"
+           tmp_libs=
+           for deplib in $dependency_libs; do
+             deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+               case "$tmp_libs " in
+               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+               esac
+              fi
+             tmp_libs="$tmp_libs $deplib"
+           done
+         elif test "$linkmode" != prog && test "$linkmode" != lib; then
+           $echo "$modename: \`$lib' is not a convenience library" 1>&2
+           exit $EXIT_FAILURE
+         fi
+         continue
+       fi # $pass = conv
+
+
        # Get the name of the library we link against.
        linklib=
        for l in $old_library $library_names; do
          linklib="$l"
        done
-
        if test -z "$linklib"; then
-         $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
-         exit 1
+         $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+         exit $EXIT_FAILURE
        fi
 
-       # Find the relevant object directory and library name.
-       name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
+       # This library was specified with -dlopen.
+       if test "$pass" = dlopen; then
+         if test -z "$libdir"; then
+           $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+           exit $EXIT_FAILURE
+         fi
+         if test -z "$dlname" ||
+            test "$dlopen_support" != yes ||
+            test "$build_libtool_libs" = no; then
+           # If there is no dlname, no dlopen support or we're linking
+           # statically, we need to preload.  We also need to preload any
+           # dependent libraries so libltdl's deplib preloader doesn't
+           # bomb out in the load deplibs phase.
+           dlprefiles="$dlprefiles $lib $dependency_libs"
+         else
+           newdlfiles="$newdlfiles $lib"
+         fi
+         continue
+       fi # $pass = dlopen
 
+       # We need an absolute path.
+       case $ladir in
+       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+       *)
+         abs_ladir=`cd "$ladir" && pwd`
+         if test -z "$abs_ladir"; then
+           $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+           $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+           abs_ladir="$ladir"
+         fi
+         ;;
+       esac
+       laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+       # Find the relevant object directory and library name.
        if test "X$installed" = Xyes; then
-         dir="$libdir"
+         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+           $echo "$modename: warning: library \`$lib' was moved." 1>&2
+           dir="$ladir"
+           absdir="$abs_ladir"
+           libdir="$abs_ladir"
+         else
+           dir="$libdir"
+           absdir="$libdir"
+         fi
        else
-         dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$dir" = "X$arg"; then
-           dir="$objdir"
+         dir="$ladir/$objdir"
+         absdir="$abs_ladir/$objdir"
+         # Remove this search path later
+         notinst_path="$notinst_path $abs_ladir"
+       fi # $installed = yes
+       name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+       # This library was specified with -dlpreopen.
+       if test "$pass" = dlpreopen; then
+         if test -z "$libdir"; then
+           $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+           exit $EXIT_FAILURE
+         fi
+         # Prefer using a static library (so that no silly _DYNAMIC symbols
+         # are required to link).
+         if test -n "$old_library"; then
+           newdlprefiles="$newdlprefiles $dir/$old_library"
+         # Otherwise, use the dlname, so that lt_dlopen finds it.
+         elif test -n "$dlname"; then
+           newdlprefiles="$newdlprefiles $dir/$dlname"
          else
-           dir="$dir/$objdir"
+           newdlprefiles="$newdlprefiles $dir/$linklib"
          fi
-       fi
-
-       if test -n "$dependency_libs"; then
-         # Extract -R and -L from dependency_libs
-         temp_deplibs=
-         for deplib in $dependency_libs; do
-           case "$deplib" in
-           -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-                case " $rpath $xrpath " in
-                *" $temp_xrpath "*) ;;
-                *) xrpath="$xrpath $temp_xrpath";;
-                esac;;
-           -L*) case "$compile_command $temp_deplibs " in
-                *" $deplib "*) ;;
-                *) temp_deplibs="$temp_deplibs $deplib";;
-                esac
-                temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-                case " $lib_search_path " in
-                *" $temp_dir "*) ;;
-                *) lib_search_path="$lib_search_path $temp_dir";;
-                esac
-                ;;
-           *) temp_deplibs="$temp_deplibs $deplib";;
-           esac
-         done
-         dependency_libs="$temp_deplibs"
-       fi
+       fi # $pass = dlpreopen
 
        if test -z "$libdir"; then
-         # It is a libtool convenience library, so add in its objects.
-         convenience="$convenience $dir/$old_library"
-         old_convenience="$old_convenience $dir/$old_library"
-         deplibs="$deplibs$dependency_libs"
-         compile_command="$compile_command $dir/$old_library$dependency_libs"
-         finalize_command="$finalize_command $dir/$old_library$dependency_libs"
+         # Link the convenience library
+         if test "$linkmode" = lib; then
+           deplibs="$dir/$old_library $deplibs"
+         elif test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$dir/$old_library $compile_deplibs"
+           finalize_deplibs="$dir/$old_library $finalize_deplibs"
+         else
+           deplibs="$lib $deplibs" # used for prog,scan pass
+         fi
          continue
        fi
 
-       # This library was specified with -dlopen.
-       if test "$prev" = dlfiles; then
-         dlfiles="$dlfiles $arg"
-         if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
-           # If there is no dlname, no dlopen support or we're linking statically,
-           # we need to preload.
-           prev=dlprefiles
-         else
-           # We should not create a dependency on this library, but we
-           # may need any libraries it requires.
-           compile_command="$compile_command$dependency_libs"
-           finalize_command="$finalize_command$dependency_libs"
-           prev=
-           continue
+
+       if test "$linkmode" = prog && test "$pass" != link; then
+         newlib_search_path="$newlib_search_path $ladir"
+         deplibs="$lib $deplibs"
+
+         linkalldeplibs=no
+         if test "$link_all_deplibs" != no || test -z "$library_names" ||
+            test "$build_libtool_libs" = no; then
+           linkalldeplibs=yes
          fi
-       fi
 
-       # The library was specified with -dlpreopen.
-       if test "$prev" = dlprefiles; then
-         # Prefer using a static library (so that no silly _DYNAMIC symbols
-         # are required to link).
-         if test -n "$old_library"; then
-           dlprefiles="$dlprefiles $dir/$old_library"
-         else
-           dlprefiles="$dlprefiles $dir/$linklib"
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           case $deplib in
+           -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+           esac
+           # Need to link against all dependency_libs?
+           if test "$linkalldeplibs" = yes; then
+             deplibs="$deplib $deplibs"
+           else
+             # Need to hardcode shared library paths
+             # or/and link against static libraries
+             newdependency_libs="$deplib $newdependency_libs"
+           fi
+           if test "X$duplicate_deps" = "Xyes" ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done # for deplib
+         continue
+       fi # $linkmode = prog...
+
+       if test "$linkmode,$pass" = "prog,link"; then
+         if test -n "$library_names" &&
+            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+           # We need to hardcode the library path
+           if test -n "$shlibpath_var"; then
+             # Make sure the rpath contains only unique directories.
+             case "$temp_rpath " in
+             *" $dir "*) ;;
+             *" $absdir "*) ;;
+             *) temp_rpath="$temp_rpath $dir" ;;
+             esac
+           fi
+
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
+           *" $absdir "*) ;;
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) compile_rpath="$compile_rpath $absdir"
+             esac
+             ;;
+           esac
+           case " $sys_lib_dlsearch_path " in
+           *" $libdir "*) ;;
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) finalize_rpath="$finalize_rpath $libdir"
+             esac
+             ;;
+           esac
+         fi # $linkmode,$pass = prog,link...
+
+         if test "$alldeplibs" = yes &&
+            { test "$deplibs_check_method" = pass_all ||
+              { test "$build_libtool_libs" = yes &&
+                test -n "$library_names"; }; }; then
+           # We only need to search for static libraries
+           continue
          fi
-         prev=
        fi
 
+       link_static=no # Whether the deplib will be linked statically
        if test -n "$library_names" &&
           { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-         link_against_libtool_libs="$link_against_libtool_libs $arg"
-         if test -n "$shlibpath_var"; then
-           # Make sure the rpath contains only unique directories.
-           case "$temp_rpath " in
-           *" $dir "*) ;;
-           *) temp_rpath="$temp_rpath $dir" ;;
-           esac
+         if test "$installed" = no; then
+           notinst_deplibs="$notinst_deplibs $lib"
+           need_relink=yes
          fi
-
-         # We need an absolute path.
-         case "$dir" in
-         [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-         *)
-           absdir=`cd "$dir" && pwd`
-           if test -z "$absdir"; then
-             $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-             $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-             absdir="$dir"
+         # This is a shared library
+
+         # Warn about portability, can't link against -module's on
+         # some systems (darwin)
+         if test "$shouldnotlink" = yes && test "$pass" = link ; then
+           $echo
+           if test "$linkmode" = prog; then
+             $echo "*** Warning: Linking the executable $output against the loadable module"
+           else
+             $echo "*** Warning: Linking the shared library $output against the loadable module"
            fi
-           ;;
-         esac
-         
-         # This is the magic to use -rpath.
-         # Skip directories that are in the system default run-time
-         # search path, unless they have been requested with -R.
-         case " $sys_lib_dlsearch_path " in
-         *" $absdir "*) ;;
-         *)
-           case "$compile_rpath " in
+           $echo "*** $linklib is not portable!"
+         fi
+         if test "$linkmode" = lib &&
+            test "$hardcode_into_libs" = yes; then
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
            *" $absdir "*) ;;
-           *) compile_rpath="$compile_rpath $absdir" 
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) compile_rpath="$compile_rpath $absdir"
+             esac
+             ;;
            esac
-           ;;
-         esac
-
-         case " $sys_lib_dlsearch_path " in
-         *" $libdir "*) ;;
-         *)
-           case "$finalize_rpath " in
+           case " $sys_lib_dlsearch_path " in
            *" $libdir "*) ;;
-           *) finalize_rpath="$finalize_rpath $libdir"
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) finalize_rpath="$finalize_rpath $libdir"
+             esac
+             ;;
            esac
-           ;;
-         esac
+         fi
 
-         lib_linked=yes
-         case "$hardcode_action" in
-         immediate | unsupported)
-           if test "$hardcode_direct" = no; then
-             compile_command="$compile_command $dir/$linklib"
-             deplibs="$deplibs $dir/$linklib"
-             case "$host" in
-             *-*-cygwin* | *-*-mingw* | *-*-os2*)
-               dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
-               if test -n "$dllsearchpath"; then
-                 dllsearchpath="$dllsearchpath:$dllsearchdir"
-               else
-                 dllsearchpath="$dllsearchdir"
-               fi
+         if test -n "$old_archive_from_expsyms_cmds"; then
+           # figure out the soname
+           set dummy $library_names
+           realname="$2"
+           shift; shift
+           libname=`eval \\$echo \"$libname_spec\"`
+           # use dlname if we got it. it's perfectly good, no?
+           if test -n "$dlname"; then
+             soname="$dlname"
+           elif test -n "$soname_spec"; then
+             # bleh windows
+             case $host in
+             *cygwin* | mingw*)
+               major=`expr $current - $age`
+               versuffix="-$major"
                ;;
              esac
-           elif test "$hardcode_minus_L" = no; then
-             case "$host" in
-             *-*-sunos*)
-               compile_shlibpath="$compile_shlibpath$dir:"
-               ;;
-             esac
-             case "$compile_command " in
-             *" -L$dir "*) ;;
-             *) compile_command="$compile_command -L$dir";;
-             esac
-             compile_command="$compile_command -l$name"
-             deplibs="$deplibs -L$dir -l$name"
-           elif test "$hardcode_shlibpath_var" = no; then
-             case ":$compile_shlibpath:" in
-             *":$dir:"*) ;;
-             *) compile_shlibpath="$compile_shlibpath$dir:";;
+             eval soname=\"$soname_spec\"
+           else
+             soname="$realname"
+           fi
+
+           # Make a new name for the extract_expsyms_cmds to use
+           soroot="$soname"
+           soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+           newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+           # If the library has no export list, then create one now
+           if test -f "$output_objdir/$soname-def"; then :
+           else
+             $show "extracting exported symbol list from \`$soname'"
+             save_ifs="$IFS"; IFS='~'
+             cmds=$extract_expsyms_cmds
+             for cmd in $cmds; do
+               IFS="$save_ifs"
+               eval cmd=\"$cmd\"
+               $show "$cmd"
+               $run eval "$cmd" || exit $?
+             done
+             IFS="$save_ifs"
+           fi
+
+           # Create $newlib
+           if test -f "$output_objdir/$newlib"; then :; else
+             $show "generating import library for \`$soname'"
+             save_ifs="$IFS"; IFS='~'
+             cmds=$old_archive_from_expsyms_cmds
+             for cmd in $cmds; do
+               IFS="$save_ifs"
+               eval cmd=\"$cmd\"
+               $show "$cmd"
+               $run eval "$cmd" || exit $?
+             done
+             IFS="$save_ifs"
+           fi
+           # make sure the library variables are pointing to the new library
+           dir=$output_objdir
+           linklib=$newlib
+         fi # test -n "$old_archive_from_expsyms_cmds"
+
+         if test "$linkmode" = prog || test "$mode" != relink; then
+           add_shlibpath=
+           add_dir=
+           add=
+           lib_linked=yes
+           case $hardcode_action in
+           immediate | unsupported)
+             if test "$hardcode_direct" = no; then
+               add="$dir/$linklib"
+               case $host in
+                 *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+                 *-*-darwin* )
+                   # if the lib is a module then we can not link against
+                   # it, someone is ignoring the new warnings I added
+                   if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+                     $echo "** Warning, lib $linklib is a module, not a shared library"
+                     if test -z "$old_library" ; then
+                       $echo
+                       $echo "** And there doesn't seem to be a static archive available"
+                       $echo "** The link will probably fail, sorry"
+                     else
+                       add="$dir/$old_library"
+                     fi
+                   fi
+               esac
+             elif test "$hardcode_minus_L" = no; then
+               case $host in
+               *-*-sunos*) add_shlibpath="$dir" ;;
+               esac
+               add_dir="-L$dir"
+               add="-l$name"
+             elif test "$hardcode_shlibpath_var" = no; then
+               add_shlibpath="$dir"
+               add="-l$name"
+             else
+               lib_linked=no
+             fi
+             ;;
+           relink)
+             if test "$hardcode_direct" = yes; then
+               add="$dir/$linklib"
+             elif test "$hardcode_minus_L" = yes; then
+               add_dir="-L$dir"
+               # Try looking first in the location we're being installed to.
+               if test -n "$inst_prefix_dir"; then
+                 case "$libdir" in
+                   [\\/]*)
+                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                     ;;
+                 esac
+               fi
+               add="-l$name"
+             elif test "$hardcode_shlibpath_var" = yes; then
+               add_shlibpath="$dir"
+               add="-l$name"
+             else
+               lib_linked=no
+             fi
+             ;;
+           *) lib_linked=no ;;
+           esac
+
+           if test "$lib_linked" != yes; then
+             $echo "$modename: configuration error: unsupported hardcode properties"
+             exit $EXIT_FAILURE
+           fi
+
+           if test -n "$add_shlibpath"; then
+             case :$compile_shlibpath: in
+             *":$add_shlibpath:"*) ;;
+             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
              esac
-             compile_command="$compile_command -l$name"
-             deplibs="$deplibs -l$name"
+           fi
+           if test "$linkmode" = prog; then
+             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+             test -n "$add" && compile_deplibs="$add $compile_deplibs"
            else
-             lib_linked=no
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+             if test "$hardcode_direct" != yes && \
+                test "$hardcode_minus_L" != yes && \
+                test "$hardcode_shlibpath_var" = yes; then
+               case :$finalize_shlibpath: in
+               *":$libdir:"*) ;;
+               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+               esac
+             fi
            fi
-           ;;
+         fi
 
-         relink)
+         if test "$linkmode" = prog || test "$mode" = relink; then
+           add_shlibpath=
+           add_dir=
+           add=
+           # Finalize command for both is simple: just hardcode it.
            if test "$hardcode_direct" = yes; then
-             compile_command="$compile_command $absdir/$linklib"
-             deplibs="$deplibs $absdir/$linklib"
+             add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then
-             case "$compile_command " in
-             *" -L$absdir "*) ;;
-             *) compile_command="$compile_command -L$absdir";;
-             esac
-             compile_command="$compile_command -l$name"
-             deplibs="$deplibs -L$absdir -l$name"
+             add_dir="-L$libdir"
+             add="-l$name"
            elif test "$hardcode_shlibpath_var" = yes; then
-             case ":$compile_shlibpath:" in
-             *":$absdir:"*) ;;
-             *) compile_shlibpath="$compile_shlibpath$absdir:";;
+             case :$finalize_shlibpath: in
+             *":$libdir:"*) ;;
+             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
              esac
-             compile_command="$compile_command -l$name"
-             deplibs="$deplibs -l$name"
+             add="-l$name"
+           elif test "$hardcode_automatic" = yes; then
+             if test -n "$inst_prefix_dir" &&
+                test -f "$inst_prefix_dir$libdir/$linklib" ; then
+               add="$inst_prefix_dir$libdir/$linklib"
+             else
+               add="$libdir/$linklib"
+             fi
            else
-             lib_linked=no
+             # We cannot seem to hardcode it, guess we'll fake it.
+             add_dir="-L$libdir"
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case "$libdir" in
+                 [\\/]*)
+                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                   ;;
+               esac
+             fi
+             add="-l$name"
            fi
-           ;;
-
-         *)
-           lib_linked=no
-           ;;
-         esac
 
-         if test "$lib_linked" != yes; then
-           $echo "$modename: configuration error: unsupported hardcode properties"
-           exit 1
-         fi
-
-         # Finalize command for both is simple: just hardcode it.
-         if test "$hardcode_direct" = yes; then
-           finalize_command="$finalize_command $libdir/$linklib"
-         elif test "$hardcode_minus_L" = yes; then
-           case "$finalize_command " in
-           *" -L$libdir "*) ;;
-           *) finalize_command="$finalize_command -L$libdir";;
-           esac
-           finalize_command="$finalize_command -l$name"
-         elif test "$hardcode_shlibpath_var" = yes; then
-           case ":$finalize_shlibpath:" in
-           *":$libdir:"*) ;;
-           *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
-           esac
-           finalize_command="$finalize_command -l$name"
-         else
-           # We cannot seem to hardcode it, guess we'll fake it.
-           case "$finalize_command " in
-           *" -L$dir "*) ;;
-           *) finalize_command="$finalize_command -L$libdir";;
-           esac
-           finalize_command="$finalize_command -l$name"
-         fi
-       else
-         # Transform directly to old archives if we don't build new libraries.
-         if test -n "$pic_flag" && test -z "$old_library"; then
-           $echo "$modename: cannot find static library for \`$arg'" 1>&2
-           exit 1
+           if test "$linkmode" = prog; then
+             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+           else
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+           fi
          fi
-
+       elif test "$linkmode" = prog; then
          # Here we assume that one of hardcode_direct or hardcode_minus_L
          # is not unsupported.  This is valid on all known static and
          # shared platforms.
          if test "$hardcode_direct" != unsupported; then
            test -n "$old_library" && linklib="$old_library"
-           compile_command="$compile_command $dir/$linklib"
-           finalize_command="$finalize_command $dir/$linklib"
+           compile_deplibs="$dir/$linklib $compile_deplibs"
+           finalize_deplibs="$dir/$linklib $finalize_deplibs"
          else
-           case "$compile_command " in
-           *" -L$dir "*) ;;
-           *) compile_command="$compile_command -L$dir";;
-           esac
-           compile_command="$compile_command -l$name"
-           case "$finalize_command " in
-           *" -L$dir "*) ;;
-           *) finalize_command="$finalize_command -L$dir";;
-           esac
-           finalize_command="$finalize_command -l$name"
+           compile_deplibs="-l$name -L$dir $compile_deplibs"
+           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+         fi
+       elif test "$build_libtool_libs" = yes; then
+         # Not a shared library
+         if test "$deplibs_check_method" != pass_all; then
+           # We're trying link a shared library against a static one
+           # but the system doesn't support it.
+
+           # Just print a warning and add the library to dependency_libs so
+           # that the program can be linked against the static library.
+           $echo
+           $echo "*** Warning: This system can not link to static lib archive $lib."
+           $echo "*** I have the capability to make that library automatically link in when"
+           $echo "*** you link to this library.  But I can only do this if you have a"
+           $echo "*** shared version of the library, which you do not appear to have."
+           if test "$module" = yes; then
+             $echo "*** But as you try to build a module library, libtool will still create "
+             $echo "*** a static module, that should work as long as the dlopening application"
+             $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+             if test -z "$global_symbol_pipe"; then
+               $echo
+               $echo "*** However, this would only work if libtool was able to extract symbol"
+               $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+               $echo "*** not find such a program.  So, this module is probably useless."
+               $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+             fi
+             if test "$build_old_libs" = no; then
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
+         else
+           convenience="$convenience $dir/$old_library"
+           old_convenience="$old_convenience $dir/$old_library"
+           deplibs="$dir/$old_library $deplibs"
+           link_static=yes
+         fi
+       fi # link shared/static library?
+
+       if test "$linkmode" = lib; then
+         if test -n "$dependency_libs" &&
+            { test "$hardcode_into_libs" != yes ||
+              test "$build_old_libs" = yes ||
+              test "$link_static" = yes; }; then
+           # Extract -R from dependency_libs
+           temp_deplibs=
+           for libdir in $dependency_libs; do
+             case $libdir in
+             -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+                  case " $xrpath " in
+                  *" $temp_xrpath "*) ;;
+                  *) xrpath="$xrpath $temp_xrpath";;
+                  esac;;
+             *) temp_deplibs="$temp_deplibs $libdir";;
+             esac
+           done
+           dependency_libs="$temp_deplibs"
          fi
-       fi
-
-       # Add in any libraries that this one depends upon.
-       compile_command="$compile_command$dependency_libs"
-       finalize_command="$finalize_command$dependency_libs"
-       continue
-       ;;
-
-      # Some other compiler argument.
-      *)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case "$arg" in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*)
-         arg="\"$arg\""
-         ;;
-       esac
-       ;;
-      esac
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-      fi
-    done
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
 
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
+         newlib_search_path="$newlib_search_path $absdir"
+         # Link against this library
+         test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+         # ... and its dependency_libs
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           newdependency_libs="$deplib $newdependency_libs"
+           if test "X$duplicate_deps" = "Xyes" ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done
 
-    case "$output" in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
+         if test "$link_all_deplibs" != no; then
+           # Add the search paths of all dependency libraries
+           for deplib in $dependency_libs; do
+             case $deplib in
+             -L*) path="$deplib" ;;
+             *.la)
+               dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+               test "X$dir" = "X$deplib" && dir="."
+               # We need an absolute path.
+               case $dir in
+               [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+               *)
+                 absdir=`cd "$dir" && pwd`
+                 if test -z "$absdir"; then
+                   $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+                   absdir="$dir"
+                 fi
+                 ;;
+               esac
+               if grep "^installed=no" $deplib > /dev/null; then
+                 path="$absdir/$objdir"
+               else
+                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                 if test -z "$libdir"; then
+                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+                   exit $EXIT_FAILURE
+                 fi
+                 if test "$absdir" != "$libdir"; then
+                   $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+                 fi
+                 path="$absdir"
+               fi
+               depdepl=
+               case $host in
+               *-*-darwin*)
+                 # we do not want to link against static libs,
+                 # but need to link against shared
+                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                 if test -n "$deplibrary_names" ; then
+                   for tmp in $deplibrary_names ; do
+                     depdepl=$tmp
+                   done
+                   if test -f "$path/$depdepl" ; then
+                     depdepl="$path/$depdepl"
+                   fi
+                   # do not add paths which are already there
+                   case " $newlib_search_path " in
+                   *" $path "*) ;;
+                   *) newlib_search_path="$newlib_search_path $path";;
+                   esac
+                 fi
+                 path=""
+                 ;;
+               *)
+                 path="-L$path"
+                 ;;
+               esac
+               ;;
+             -l*)
+               case $host in
+               *-*-darwin*)
+                 # Again, we only want to link against shared libraries
+                 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+                 for tmp in $newlib_search_path ; do
+                   if test -f "$tmp/lib$tmp_libs.dylib" ; then
+                     eval depdepl="$tmp/lib$tmp_libs.dylib"
+                     break
+                   fi
+                 done
+                 path=""
+                 ;;
+               *) continue ;;
+               esac
+               ;;
+             *) continue ;;
+             esac
+             case " $deplibs " in
+             *" $depdepl "*) ;;
+             *) deplibs="$depdepl $deplibs" ;;
+             esac
+             case " $deplibs " in
+             *" $path "*) ;;
+             *) deplibs="$deplibs $path" ;;
+             esac
+           done
+         fi # link_all_deplibs != no
+       fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+       # Link the dlpreopened libraries before other libraries
+       for deplib in $save_deplibs; do
+         deplibs="$deplib $deplibs"
+       done
+      fi
+      if test "$pass" != dlopen; then
+       if test "$pass" != conv; then
+         # Make sure lib_search_path contains only unique directories.
+         lib_search_path=
+         for dir in $newlib_search_path; do
+           case "$lib_search_path " in
+           *" $dir "*) ;;
+           *) lib_search_path="$lib_search_path $dir" ;;
+           esac
+         done
+         newlib_search_path=
+       fi
 
-    *.a | *.lib)
-      if test -n "$link_against_libtool_libs"; then
-       $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
-       exit 1
+       if test "$linkmode,$pass" != "prog,link"; then
+         vars="deplibs"
+       else
+         vars="compile_deplibs finalize_deplibs"
+       fi
+       for var in $vars dependency_libs; do
+         # Add libraries to $var in reverse order
+         eval tmp_libs=\"\$$var\"
+         new_libs=
+         for deplib in $tmp_libs; do
+           # FIXME: Pedantically, this is the right thing to do, so
+           #        that some nasty dependency loop isn't accidentally
+           #        broken:
+           #new_libs="$deplib $new_libs"
+           # Pragmatically, this seems to cause very few problems in
+           # practice:
+           case $deplib in
+           -L*) new_libs="$deplib $new_libs" ;;
+           -R*) ;;
+           *)
+             # And here is the reason: when a library appears more
+             # than once as an explicit dependence of a library, or
+             # is implicitly linked in more than once by the
+             # compiler, it is considered special, and multiple
+             # occurrences thereof are not removed.  Compare this
+             # with having the same library being listed as a
+             # dependency of multiple other libraries: in this case,
+             # we know (pedantically, we assume) the library does not
+             # need to be listed more than once, so we keep only the
+             # last copy.  This is not always right, but it is rare
+             # enough that we require users that really mean to play
+             # such unportable linking tricks to link the library
+             # using -Wl,-lname, so that libtool does not consider it
+             # for duplicate removal.
+             case " $specialdeplibs " in
+             *" $deplib "*) new_libs="$deplib $new_libs" ;;
+             *)
+               case " $new_libs " in
+               *" $deplib "*) ;;
+               *) new_libs="$deplib $new_libs" ;;
+               esac
+               ;;
+             esac
+             ;;
+           esac
+         done
+         tmp_libs=
+         for deplib in $new_libs; do
+           case $deplib in
+           -L*)
+             case " $tmp_libs " in
+             *" $deplib "*) ;;
+             *) tmp_libs="$tmp_libs $deplib" ;;
+             esac
+             ;;
+           *) tmp_libs="$tmp_libs $deplib" ;;
+           esac
+         done
+         eval $var=\"$tmp_libs\"
+       done # for var
       fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+       case " $predeps $postdeps $compiler_lib_search_path " in
+       *" $i "*)
+         i=""
+         ;;
+       esac
+       if test -n "$i" ; then
+         tmp_libs="$tmp_libs $i"
+       fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
 
+    case $linkmode in
+    oldlib)
       if test -n "$deplibs"; then
        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
       fi
@@ -1552,7 +2815,7 @@ compiler."
       fi
 
       if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+       $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
       fi
 
       if test -n "$release"; then
@@ -1566,24 +2829,27 @@ compiler."
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
+      objs="$objs$old_deplibs"
       ;;
 
-    *.la)
+    lib)
       # Make sure we only generate libraries of the form `libNAME.la'.
-      case "$outputname" in
+      case $outputname in
       lib*)
        name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+       eval shared_ext=\"$shrext_cmds\"
        eval libname=\"$libname_spec\"
        ;;
       *)
        if test "$module" = no; then
          $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
        if test "$need_lib_prefix" != no; then
          # Add the "lib" prefix for modules if required
          name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+         eval shared_ext=\"$shrext_cmds\"
          eval libname=\"$libname_spec\"
        else
          libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -1591,30 +2857,24 @@ compiler."
        ;;
       esac
 
-      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$output_objdir" = "X$output"; then
-       output_objdir="$objdir"
-      else
-       output_objdir="$output_objdir/$objdir"
-      fi
-
       if test -n "$objs"; then
-       $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
-       exit 1
-      fi
-
-      # How the heck are we supposed to write a wrapper for a shared library?
-      if test -n "$link_against_libtool_libs"; then
-        $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
-        exit 1
+       if test "$deplibs_check_method" != pass_all; then
+         $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+         exit $EXIT_FAILURE
+       else
+         $echo
+         $echo "*** Warning: Linking the shared library $output against the non-libtool"
+         $echo "*** objects $objs is not portable!"
+         libobjs="$libobjs $objs"
+       fi
       fi
 
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
+      if test "$dlself" != no; then
+       $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
       fi
 
       set dummy $rpath
-      if test $# -gt 2; then
+      if test "$#" -gt 2; then
        $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
       fi
       install_libdir="$2"
@@ -1623,15 +2883,16 @@ compiler."
       if test -z "$rpath"; then
        if test "$build_libtool_libs" = yes; then
          # Building a libtool convenience library.
-         libext=al
+         # Some compilers have problems with a `.al' extension so
+         # convenience libraries should have the same extension an
+         # archive normally would.
          oldlibs="$output_objdir/$libname.$libext $oldlibs"
          build_libtool_libs=convenience
          build_old_libs=yes
        fi
-       dependency_libs="$deplibs"
 
        if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+         $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
        fi
 
        if test -n "$release"; then
@@ -1640,73 +2901,138 @@ compiler."
       else
 
        # Parse the version information argument.
-       IFS="${IFS=     }"; save_ifs="$IFS"; IFS=':'
+       save_ifs="$IFS"; IFS=':'
        set dummy $vinfo 0 0 0
        IFS="$save_ifs"
 
        if test -n "$8"; then
          $echo "$modename: too many parameters to \`-version-info'" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
 
-       current="$2"
-       revision="$3"
-       age="$4"
+       # convert absolute version numbers to libtool ages
+       # this retains compatibility with .la files and attempts
+       # to make the code below a bit more comprehensible
+
+       case $vinfo_number in
+       yes)
+         number_major="$2"
+         number_minor="$3"
+         number_revision="$4"
+         #
+         # There are really only two kinds -- those that
+         # use the current revision as the major version
+         # and those that subtract age and use age as
+         # a minor version.  But, then there is irix
+         # which has an extra 1 added just for fun
+         #
+         case $version_type in
+         darwin|linux|osf|windows)
+           current=`expr $number_major + $number_minor`
+           age="$number_minor"
+           revision="$number_revision"
+           ;;
+         freebsd-aout|freebsd-elf|sunos)
+           current="$number_major"
+           revision="$number_minor"
+           age="0"
+           ;;
+         irix|nonstopux)
+           current=`expr $number_major + $number_minor - 1`
+           age="$number_minor"
+           revision="$number_minor"
+           ;;
+         esac
+         ;;
+       no)
+         current="$2"
+         revision="$3"
+         age="$4"
+         ;;
+       esac
 
        # Check that each of the things are valid numbers.
-       case "$current" in
+       case $current in
        [0-9]*) ;;
        *)
          $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
 
-       case "$revision" in
+       case $revision in
        [0-9]*) ;;
        *)
          $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
 
-       case "$age" in
+       case $age in
        [0-9]*) ;;
        *)
          $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
 
-       if test $age -gt $current; then
+       if test "$age" -gt "$current"; then
          $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
 
        # Calculate the version variables.
        major=
        versuffix=
        verstring=
-       case "$version_type" in
+       case $version_type in
        none) ;;
 
-       irix)
+       darwin)
+         # Like Linux, but with the current version available in
+         # verstring for coding it into the library header
+         major=.`expr $current - $age`
+         versuffix="$major.$age.$revision"
+         # Darwin ld doesn't like 0 for these options...
+         minor_current=`expr $current + 1`
+         verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+         ;;
+
+       freebsd-aout)
+         major=".$current"
+         versuffix=".$current.$revision";
+         ;;
+
+       freebsd-elf)
+         major=".$current"
+         versuffix=".$current";
+         ;;
+
+       irix | nonstopux)
          major=`expr $current - $age + 1`
-         versuffix="$major.$revision"
-         verstring="sgi$major.$revision"
+
+         case $version_type in
+           nonstopux) verstring_prefix=nonstopux ;;
+           *)         verstring_prefix=sgi ;;
+         esac
+         verstring="$verstring_prefix$major.$revision"
 
          # Add in all the interfaces that we are compatible with.
          loop=$revision
-         while test $loop != 0; do
+         while test "$loop" -ne 0; do
            iface=`expr $revision - $loop`
            loop=`expr $loop - 1`
-           verstring="sgi$major.$iface:$verstring"
+           verstring="$verstring_prefix$major.$iface:$verstring"
          done
+
+         # Before this point, $major must not contain `.'.
+         major=.$major
+         versuffix="$major.$revision"
          ;;
 
        linux)
@@ -1715,13 +3041,13 @@ compiler."
          ;;
 
        osf)
-         major=`expr $current - $age`
+         major=.`expr $current - $age`
          versuffix=".$current.$age.$revision"
          verstring="$current.$age.$revision"
 
          # Add in all the interfaces that we are compatible with.
          loop=$age
-         while test $loop != 0; do
+         while test "$loop" -ne 0; do
            iface=`expr $current - $loop`
            loop=`expr $loop - 1`
            verstring="$verstring:${iface}.0"
@@ -1736,34 +3062,33 @@ compiler."
          versuffix=".$current.$revision"
          ;;
 
-       freebsd-aout)
-         major=".$current"
-         versuffix=".$current.$revision";
-         ;;
-
-       freebsd-elf)
-         major=".$current"
-         versuffix=".$current";
-         ;;
-
        windows)
-         # Like Linux, but with '-' rather than '.', since we only
-         # want one extension on Windows 95.
+         # Use '-' rather than '.', since we only want one
+         # extension on DOS 8.3 filesystems.
          major=`expr $current - $age`
-         versuffix="-$major-$age-$revision"
+         versuffix="-$major"
          ;;
 
        *)
          $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-         exit 1
+         $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+         exit $EXIT_FAILURE
          ;;
        esac
 
        # Clear the version info if we defaulted, and they specified a release.
        if test -z "$vinfo" && test -n "$release"; then
          major=
-         verstring="0.0"
+         case $version_type in
+         darwin)
+           # we can't check for "0.0" in archive_cmds due to quoting
+           # problems, so we reset it completely
+           verstring=
+           ;;
+         *)
+           verstring="0.0"
+           ;;
+         esac
          if test "$need_version" = no; then
            versuffix=
          else
@@ -1777,7 +3102,7 @@ compiler."
          versuffix=
          verstring=""
        fi
-       
+
        # Check to see if the archive will have undefined symbols.
        if test "$allow_undefined" = yes; then
          if test "$allow_undefined_flag" = unsupported; then
@@ -1789,33 +3114,32 @@ compiler."
          # Don't allow undefined symbols.
          allow_undefined_flag="$no_undefined_flag"
        fi
-
-       dependency_libs="$deplibs"
-       case "$host" in
-       *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
-         # these systems don't actually have a c library (as such)!
-         ;;
-        *-*-rhapsody*)
-         # rhapsody is a little odd...
-         deplibs="$deplibs -framework System"
-         ;;
-       *)
-         # Add libc to deplibs on all other systems.
-         deplibs="$deplibs -lc"
-         ;;
-       esac
       fi
 
-      # Create the output directory, or remove our outputs if we need to.
-      if test -d $output_objdir; then
-       $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-       $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-      else
-       $show "$mkdir $output_objdir"
-       $run $mkdir $output_objdir
-       status=$?
-       if test $status -ne 0 && test ! -d $output_objdir; then
-         exit $status
+      if test "$mode" != relink; then
+       # Remove our outputs, but don't remove object files since they
+       # may have been created when compiling PIC objects.
+       removelist=
+       tempremovelist=`$echo "$output_objdir/*"`
+       for p in $tempremovelist; do
+         case $p in
+           *.$objext)
+              ;;
+           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+              if test "X$precious_files_regex" != "X"; then
+                if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                then
+                  continue
+                fi
+              fi
+              removelist="$removelist $p"
+              ;;
+           *) ;;
+         esac
+       done
+       if test -n "$removelist"; then
+         $show "${rm}r $removelist"
+         $run ${rm}r $removelist
        fi
       fi
 
@@ -1827,7 +3151,74 @@ compiler."
        oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
+      # Eliminate all temporary directories.
+      for path in $notinst_path; do
+       lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+       deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+       dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+      done
+
+      if test -n "$xrpath"; then
+       # If the user specified any rpath flags, then add them.
+       temp_xrpath=
+       for libdir in $xrpath; do
+         temp_xrpath="$temp_xrpath -R$libdir"
+         case "$finalize_rpath " in
+         *" $libdir "*) ;;
+         *) finalize_rpath="$finalize_rpath $libdir" ;;
+         esac
+       done
+       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+         dependency_libs="$temp_xrpath $dependency_libs"
+       fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+       case " $dlprefiles $dlfiles " in
+       *" $lib "*) ;;
+       *) dlfiles="$dlfiles $lib" ;;
+       esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+       case "$dlprefiles " in
+       *" $lib "*) ;;
+       *) dlprefiles="$dlprefiles $lib" ;;
+       esac
+      done
+
       if test "$build_libtool_libs" = yes; then
+       if test -n "$rpath"; then
+         case $host in
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+           # these systems don't actually have a c library (as such)!
+           ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C library is in the System framework
+           deplibs="$deplibs -framework System"
+           ;;
+         *-*-netbsd*)
+           # Don't link with libc until the a.out ld.so is fixed.
+           ;;
+         *-*-openbsd* | *-*-freebsd*)
+           # Do not include libc due to us having libc/libc_r.
+           test "X$arg" = "X-lc" && continue
+           ;;
+         *)
+           # Add libc to deplibs on all other systems if necessary.
+           if test "$build_libtool_need_lc" = "yes"; then
+             deplibs="$deplibs -lc"
+           fi
+           ;;
+         esac
+       fi
+
        # Transform deplibs into only deplibs that can be linked in shared.
        name_save=$name
        libname_save=$libname
@@ -1842,13 +3233,13 @@ compiler."
        major=""
        newdeplibs=
        droppeddeps=no
-       case "$deplibs_check_method" in
+       case $deplibs_check_method in
        pass_all)
          # Don't check for shared/static.  Everything works.
          # This might be a little naive.  We might want to check
          # whether the library exists or not.  But this is on
          # osf3 & osf4 and I'm not really sure... Just
-         # implementing what was already the behaviour.
+         # implementing what was already the behavior.
          newdeplibs=$deplibs
          ;;
        test_compile)
@@ -1861,64 +3252,88 @@ compiler."
          int main() { return 0; }
 EOF
          $rm conftest
-         $CC -o conftest conftest.c $deplibs
-         if test $? -eq 0 ; then
+         $LTCC -o conftest conftest.c $deplibs
+         if test "$?" -eq 0 ; then
            ldd_output=`ldd conftest`
            for i in $deplibs; do
              name="`expr $i : '-l\(.*\)'`"
              # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" ; then
-               libname=`eval \\$echo \"$libname_spec\"`
-               deplib_matches=`eval \\$echo \"$library_names_spec\"`
-               set dummy $deplib_matches
-               deplib_match=$2
-               if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                 newdeplibs="$newdeplibs $i"
-               else
-                 droppeddeps=yes
-                 echo
-                 echo "*** Warning: This library needs some functionality provided by $i."
-                 echo "*** I have the capability to make that library automatically link in when"
-                 echo "*** you link to this library.  But I can only do this if you have a"
-                 echo "*** shared version of the library, which you do not appear to have."
+              if test "$name" != "" && test "$name" -ne "0"; then
+               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                 case " $predeps $postdeps " in
+                 *" $i "*)
+                   newdeplibs="$newdeplibs $i"
+                   i=""
+                   ;;
+                 esac
+               fi
+               if test -n "$i" ; then
+                 libname=`eval \\$echo \"$libname_spec\"`
+                 deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                 set dummy $deplib_matches
+                 deplib_match=$2
+                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                   newdeplibs="$newdeplibs $i"
+                 else
+                   droppeddeps=yes
+                   $echo
+                   $echo "*** Warning: dynamic linker does not accept needed library $i."
+                   $echo "*** I have the capability to make that library automatically link in when"
+                   $echo "*** you link to this library.  But I can only do this if you have a"
+                   $echo "*** shared version of the library, which I believe you do not have"
+                   $echo "*** because a test_compile did reveal that the linker did not use it for"
+                   $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+                 fi
                fi
              else
                newdeplibs="$newdeplibs $i"
              fi
            done
          else
-           # Error occured in the first compile.  Let's try to salvage the situation:
-           # Compile a seperate program for each library.
+           # Error occurred in the first compile.  Let's try to salvage
+           # the situation: Compile a separate program for each library.
            for i in $deplibs; do
              name="`expr $i : '-l\(.*\)'`"
-            # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" ; then
+             # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
                $rm conftest
-               $CC -o conftest conftest.c $i
+               $LTCC -o conftest conftest.c $i
                # Did it work?
-               if test $? -eq 0 ; then
+               if test "$?" -eq 0 ; then
                  ldd_output=`ldd conftest`
-                 libname=`eval \\$echo \"$libname_spec\"`
-                 deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                 set dummy $deplib_matches
-                 deplib_match=$2
-                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                   newdeplibs="$newdeplibs $i"
-                 else
-                   droppeddeps=yes
-                   echo
-                   echo "*** Warning: This library needs some functionality provided by $i."
-                   echo "*** I have the capability to make that library automatically link in when"
-                   echo "*** you link to this library.  But I can only do this if you have a"
-                   echo "*** shared version of the library, which you do not appear to have."
+                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                   case " $predeps $postdeps " in
+                   *" $i "*)
+                     newdeplibs="$newdeplibs $i"
+                     i=""
+                     ;;
+                   esac
+                 fi
+                 if test -n "$i" ; then
+                   libname=`eval \\$echo \"$libname_spec\"`
+                   deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                   set dummy $deplib_matches
+                   deplib_match=$2
+                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                     newdeplibs="$newdeplibs $i"
+                   else
+                     droppeddeps=yes
+                     $echo
+                     $echo "*** Warning: dynamic linker does not accept needed library $i."
+                     $echo "*** I have the capability to make that library automatically link in when"
+                     $echo "*** you link to this library.  But I can only do this if you have a"
+                     $echo "*** shared version of the library, which you do not appear to have"
+                     $echo "*** because a test_compile did reveal that the linker did not use this one"
+                     $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+                   fi
                  fi
                else
                  droppeddeps=yes
-                 echo
-                 echo "*** Warning!  Library $i is needed by this library but I was not able to"
-                 echo "***  make it link in!  You will probably need to install it or some"
-                 echo "*** library that it depends on before this library will be fully"
-                 echo "*** functional.  Installing it before continuing would be even better."
+                 $echo
+                 $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+                 $echo "***  make it link in!  You will probably need to install it or some"
+                 $echo "*** library that it depends on before this library will be fully"
+                 $echo "*** functional.  Installing it before continuing would be even better."
                fi
              else
                newdeplibs="$newdeplibs $i"
@@ -1928,19 +3343,28 @@ EOF
          ;;
        file_magic*)
          set dummy $deplibs_check_method
-         file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
+         file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
          for a_deplib in $deplibs; do
            name="`expr $a_deplib : '-l\(.*\)'`"
            # If $name is empty we are operating on a -L argument.
-           if test "$name" != "" ; then
-             libname=`eval \\$echo \"$libname_spec\"`
-             for i in $lib_search_path; do
-                   potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                   for potent_lib in $potential_libs; do
+            if test "$name" != "" && test  "$name" != "0"; then
+             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 newdeplibs="$newdeplibs $a_deplib"
+                 a_deplib=""
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib" ; then
+               libname=`eval \\$echo \"$libname_spec\"`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 for potent_lib in $potential_libs; do
                      # Follow soft links.
                      if ls -lLd "$potent_lib" 2>/dev/null \
                         | grep " -> " >/dev/null; then
-                       continue 
+                       continue
                      fi
                      # The statement above tries to avoid entering an
                      # endless loop below, in case of cyclic links.
@@ -1949,28 +3373,88 @@ EOF
                      # but so what?
                      potlib="$potent_lib"
                      while test -h "$potlib" 2>/dev/null; do
-                       potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-                       case "$potliblink" in
+                       potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+                       case $potliblink in
                        [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
                        *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                        esac
                      done
                      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-                        | sed 10q \
-                        | egrep "$file_magic_regex" > /dev/null; then
+                        | ${SED} 10q \
+                        | $EGREP "$file_magic_regex" > /dev/null; then
                        newdeplibs="$newdeplibs $a_deplib"
                        a_deplib=""
                        break 2
                      fi
-                   done
-             done
+                 done
+               done
+             fi
+             if test -n "$a_deplib" ; then
+               droppeddeps=yes
+               $echo
+               $echo "*** Warning: linker path does not have real file for library $a_deplib."
+               $echo "*** I have the capability to make that library automatically link in when"
+               $echo "*** you link to this library.  But I can only do this if you have a"
+               $echo "*** shared version of the library, which you do not appear to have"
+               $echo "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib" ; then
+                 $echo "*** with $libname but no candidates were found. (...for file magic test)"
+               else
+                 $echo "*** with $libname and none of the candidates passed a file format test"
+                 $echo "*** using a file magic. Last file checked: $potlib"
+               fi
+             fi
+           else
+             # Add a -L argument.
+             newdeplibs="$newdeplibs $a_deplib"
+           fi
+         done # Gone through all deplibs.
+         ;;
+       match_pattern*)
+         set dummy $deplibs_check_method
+         match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+         for a_deplib in $deplibs; do
+           name="`expr $a_deplib : '-l\(.*\)'`"
+           # If $name is empty we are operating on a -L argument.
+           if test -n "$name" && test "$name" != "0"; then
+             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 newdeplibs="$newdeplibs $a_deplib"
+                 a_deplib=""
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib" ; then
+               libname=`eval \\$echo \"$libname_spec\"`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 for potent_lib in $potential_libs; do
+                   potlib="$potent_lib" # see symlink-check above in file_magic test
+                   if eval $echo \"$potent_lib\" 2>/dev/null \
+                       | ${SED} 10q \
+                       | $EGREP "$match_pattern_regex" > /dev/null; then
+                     newdeplibs="$newdeplibs $a_deplib"
+                     a_deplib=""
+                     break 2
+                   fi
+                 done
+               done
+             fi
              if test -n "$a_deplib" ; then
                droppeddeps=yes
-               echo
-               echo "*** Warning: This library needs some functionality provided by $a_deplib."
-               echo "*** I have the capability to make that library automatically link in when"
-               echo "*** you link to this library.  But I can only do this if you have a"
-               echo "*** shared version of the library, which you do not appear to have."
+               $echo
+               $echo "*** Warning: linker path does not have real file for library $a_deplib."
+               $echo "*** I have the capability to make that library automatically link in when"
+               $echo "*** you link to this library.  But I can only do this if you have a"
+               $echo "*** shared version of the library, which you do not appear to have"
+               $echo "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib" ; then
+                 $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+               else
+                 $echo "*** with $libname and none of the candidates passed a file format test"
+                 $echo "*** using a regex pattern. Last file checked: $potlib"
+               fi
              fi
            else
              # Add a -L argument.
@@ -1980,16 +3464,23 @@ EOF
          ;;
        none | unknown | *)
          newdeplibs=""
-         if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-              -e 's/ -[LR][^ ]*//g' -e 's/[    ]//g' |
-            grep . >/dev/null; then
-           echo
+         tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+           -e 's/ -[LR][^ ]*//g'`
+         if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+           for i in $predeps $postdeps ; do
+             # can't use Xsed below, because $i might contain '/'
+             tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+           done
+         fi
+         if $echo "X $tmp_deplibs" | $Xsed -e 's/[     ]//g' \
+           | grep . >/dev/null; then
+           $echo
            if test "X$deplibs_check_method" = "Xnone"; then
-             echo "*** Warning: inter-library dependencies are not supported in this platform."
+             $echo "*** Warning: inter-library dependencies are not supported in this platform."
            else
-             echo "*** Warning: inter-library dependencies are not known to be supported."
+             $echo "*** Warning: inter-library dependencies are not known to be supported."
            fi
-           echo "*** All declared inter-library dependencies are being dropped."
+           $echo "*** All declared inter-library dependencies are being dropped."
            droppeddeps=yes
          fi
          ;;
@@ -2000,19 +3491,26 @@ EOF
        libname=$libname_save
        name=$name_save
 
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+         # On Rhapsody replace the C library is the System framework
+         newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+         ;;
+       esac
+
        if test "$droppeddeps" = yes; then
          if test "$module" = yes; then
-           echo
-           echo "*** Warning: libtool could not satisfy all declared inter-library"
-           echo "*** dependencies of module $libname.  Therefore, libtool will create"
-           echo "*** a static module, that should work as long as the dlopening"
-           echo "*** application is linked with the -dlopen flag."
+           $echo
+           $echo "*** Warning: libtool could not satisfy all declared inter-library"
+           $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+           $echo "*** a static module, that should work as long as the dlopening"
+           $echo "*** application is linked with the -dlopen flag."
            if test -z "$global_symbol_pipe"; then
-             echo
-             echo "*** However, this would only work if libtool was able to extract symbol"
-             echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-             echo "*** not find such a program.  So, this module is probably useless."
-             echo "*** \`nm' from GNU binutils and a full rebuild may help."
+             $echo
+             $echo "*** However, this would only work if libtool was able to extract symbol"
+             $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+             $echo "*** not find such a program.  So, this module is probably useless."
+             $echo "*** \`nm' from GNU binutils and a full rebuild may help."
            fi
            if test "$build_old_libs" = no; then
              oldlibs="$output_objdir/$libname.$libext"
@@ -2022,9 +3520,24 @@ EOF
              build_libtool_libs=no
            fi
          else
-           echo "*** The inter-library dependencies that have been dropped here will be"
-           echo "*** automatically added whenever a program is linked with this library"
-           echo "*** or is declared to -dlopen it."
+           $echo "*** The inter-library dependencies that have been dropped here will be"
+           $echo "*** automatically added whenever a program is linked with this library"
+           $echo "*** or is declared to -dlopen it."
+
+           if test "$allow_undefined" = no; then
+             $echo
+             $echo "*** Since this library must not contain undefined symbols,"
+             $echo "*** because either the platform does not support them or"
+             $echo "*** it was explicitly requested with -no-undefined,"
+             $echo "*** libtool will only create a static version of it."
+             if test "$build_old_libs" = no; then
+               oldlibs="$output_objdir/$libname.$libext"
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
          fi
        fi
        # Done checking deplibs!
@@ -2035,10 +3548,70 @@ EOF
       library_names=
       old_library=
       dlname=
-      
+
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+       if test "$hardcode_into_libs" = yes; then
+         # Hardcode the library paths
+         hardcode_libdirs=
+         dep_rpath=
+         rpath="$finalize_rpath"
+         test "$mode" != relink && rpath="$compile_rpath$rpath"
+         for libdir in $rpath; do
+           if test -n "$hardcode_libdir_flag_spec"; then
+             if test -n "$hardcode_libdir_separator"; then
+               if test -z "$hardcode_libdirs"; then
+                 hardcode_libdirs="$libdir"
+               else
+                 # Just accumulate the unique libdirs.
+                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                   ;;
+                 *)
+                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+                   ;;
+                 esac
+               fi
+             else
+               eval flag=\"$hardcode_libdir_flag_spec\"
+               dep_rpath="$dep_rpath $flag"
+             fi
+           elif test -n "$runpath_var"; then
+             case "$perm_rpath " in
+             *" $libdir "*) ;;
+             *) perm_rpath="$perm_rpath $libdir" ;;
+             esac
+           fi
+         done
+         # Substitute the hardcoded libdirs into the rpath.
+         if test -n "$hardcode_libdir_separator" &&
+            test -n "$hardcode_libdirs"; then
+           libdir="$hardcode_libdirs"
+           if test -n "$hardcode_libdir_flag_spec_ld"; then
+             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+           else
+             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+           fi
+         fi
+         if test -n "$runpath_var" && test -n "$perm_rpath"; then
+           # We should set the runpath_var.
+           rpath=
+           for dir in $perm_rpath; do
+             rpath="$rpath$dir:"
+           done
+           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+         fi
+         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+       fi
+
+       shlibpath="$finalize_shlibpath"
+       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+       if test -n "$shlibpath"; then
+         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+       fi
+
        # Get the real and link names of the library.
+       eval shared_ext=\"$shrext_cmds\"
        eval library_names=\"$library_names_spec\"
        set dummy $library_names
        realname="$2"
@@ -2049,6 +3622,9 @@ EOF
        else
          soname="$realname"
        fi
+       if test -z "$dlname"; then
+         dlname=$soname
+       fi
 
        lib="$output_objdir/$realname"
        for link
@@ -2056,23 +3632,6 @@ EOF
          linknames="$linknames $link"
        done
 
-       # Ensure that we have .o objects for linkers which dislike .lo
-       # (e.g. aix) in case we are running --disable-static
-       for obj in $libobjs; do
-         xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$xdir" = "X$obj"; then
-           xdir="."
-         else
-           xdir="$xdir"
-         fi
-         baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-         oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-         if test ! -f $xdir/$oldobj; then
-           $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-           $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-         fi
-       done
-
        # Use standard objects if they are pic
        test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
@@ -2082,17 +3641,26 @@ EOF
            $show "generating symbol list for \`$libname.la'"
            export_symbols="$output_objdir/$libname.exp"
            $run $rm $export_symbols
-           eval cmds=\"$export_symbols_cmds\"
-           IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
+           cmds=$export_symbols_cmds
+           save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
-             $show "$cmd"
-             $run eval "$cmd" || exit $?
+             eval cmd=\"$cmd\"
+             if len=`expr "X$cmd" : ".*"` &&
+              test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+               $show "$cmd"
+               $run eval "$cmd" || exit $?
+               skipped_export=false
+             else
+               # The command line is too long to execute in one step.
+               $show "using reloadable object file for export list..."
+               skipped_export=:
+             fi
            done
            IFS="$save_ifs"
            if test -n "$export_symbols_regex"; then
-             $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-             $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+             $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+             $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
              $show "$mv \"${export_symbols}T\" \"$export_symbols\""
              $run eval '$mv "${export_symbols}T" "$export_symbols"'
            fi
@@ -2103,24 +3671,44 @@ EOF
          $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
        fi
 
+       tmp_deplibs=
+       inst_prefix_arg=
+       for test_deplib in $deplibs; do
+               case " $convenience " in
+               *" $test_deplib "*) ;;
+               *)
+                       if test -n "$inst_prefix_dir" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then
+                               inst_prefix_arg="$test_deplib"
+                       else
+                               tmp_deplibs="$tmp_deplibs $test_deplib"
+                       fi
+                       ;;
+               esac
+       done
+       deplibs="$tmp_deplibs"
+       if test -n "$inst_prefix_arg"; then
+               deplibs="$inst_prefix_arg $deplibs"
+       fi
+
        if test -n "$convenience"; then
          if test -n "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
            eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
          else
            gentop="$output_objdir/${outputname}x"
            $show "${rm}r $gentop"
            $run ${rm}r "$gentop"
-           $show "mkdir $gentop"
-           $run mkdir "$gentop"
+           $show "$mkdir $gentop"
+           $run $mkdir "$gentop"
            status=$?
-           if test $status -ne 0 && test ! -d "$gentop"; then
+           if test "$status" -ne 0 && test ! -d "$gentop"; then
              exit $status
            fi
            generated="$generated $gentop"
 
            for xlib in $convenience; do
              # Extract the objects.
-             case "$xlib" in
+             case $xlib in
              [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
              *) xabs=`pwd`"/$xlib" ;;
              esac
@@ -2129,39 +3717,209 @@ EOF
 
              $show "${rm}r $xdir"
              $run ${rm}r "$xdir"
-             $show "mkdir $xdir"
-             $run mkdir "$xdir"
+             $show "$mkdir $xdir"
+             $run $mkdir "$xdir"
              status=$?
-             if test $status -ne 0 && test ! -d "$xdir"; then
+             if test "$status" -ne 0 && test ! -d "$xdir"; then
                exit $status
              fi
+             # We will extract separately just the conflicting names and we will no
+             # longer touch any unique names. It is faster to leave these extract
+             # automatically by $AR in one run.
              $show "(cd $xdir && $AR x $xabs)"
              $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+             if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+               :
+             else
+               $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+               $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+               $AR t "$xabs" | sort | uniq -cd | while read -r count name
+               do
+                 i=1
+                 while test "$i" -le "$count"
+                 do
+                  # Put our $i before any first dot (extension)
+                  # Never overwrite any file
+                  name_to="$name"
+                  while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+                  do
+                    name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+                  done
+                  $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+                  $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+                  i=`expr $i + 1`
+                 done
+               done
+             fi
 
-             libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+             libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
            done
          fi
        fi
 
        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
          eval flag=\"$thread_safe_flag_spec\"
-         linkopts="$linkopts $flag"
+         linker_flags="$linker_flags $flag"
+       fi
+
+       # Make a backup of the uninstalled library when relinking
+       if test "$mode" = relink; then
+         $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
        fi
 
        # Do each of the archive commands.
+       if test "$module" = yes && test -n "$module_cmds" ; then
+         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+           eval test_cmds=\"$module_expsym_cmds\"
+           cmds=$module_expsym_cmds
+         else
+           eval test_cmds=\"$module_cmds\"
+           cmds=$module_cmds
+         fi
+       else
        if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-         eval cmds=\"$archive_expsym_cmds\"
+         eval test_cmds=\"$archive_expsym_cmds\"
+         cmds=$archive_expsym_cmds
+       else
+         eval test_cmds=\"$archive_cmds\"
+         cmds=$archive_cmds
+         fi
+       fi
+
+       if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+          test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         :
        else
-         eval cmds=\"$archive_cmds\"
+         # The command line is too long to link in one step, link piecewise.
+         $echo "creating reloadable object files..."
+
+         # Save the value of $output and $libobjs because we want to
+         # use them later.  If we have whole_archive_flag_spec, we
+         # want to use save_libobjs as it was before
+         # whole_archive_flag_spec was expanded, because we can't
+         # assume the linker understands whole_archive_flag_spec.
+         # This may have to be revisited, in case too many
+         # convenience libraries get linked in and end up exceeding
+         # the spec.
+         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
+         fi
+         save_output=$output
+
+         # Clear the reloadable object creation command queue and
+         # initialize k to one.
+         test_cmds=
+         concat_cmds=
+         objlist=
+         delfiles=
+         last_robj=
+         k=1
+         output=$output_objdir/$save_output-${k}.$objext
+         # Loop over the list of objects to be linked.
+         for obj in $save_libobjs
+         do
+           eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+           if test "X$objlist" = X ||
+              { len=`expr "X$test_cmds" : ".*"` &&
+                test "$len" -le "$max_cmd_len"; }; then
+             objlist="$objlist $obj"
+           else
+             # The command $test_cmds is almost too long, add a
+             # command to the queue.
+             if test "$k" -eq 1 ; then
+               # The first file doesn't have a previous command to add.
+               eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+             else
+               # All subsequent reloadable object files will link in
+               # the last one created.
+               eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+             fi
+             last_robj=$output_objdir/$save_output-${k}.$objext
+             k=`expr $k + 1`
+             output=$output_objdir/$save_output-${k}.$objext
+             objlist=$obj
+             len=1
+           fi
+         done
+         # Handle the remaining objects by creating one last
+         # reloadable object file.  All subsequent reloadable object
+         # files will link in the last one created.
+         test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+         eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+         if ${skipped_export-false}; then
+           $show "generating symbol list for \`$libname.la'"
+           export_symbols="$output_objdir/$libname.exp"
+           $run $rm $export_symbols
+           libobjs=$output
+           # Append the command to create the export file.
+           eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+         # Set up a command to remove the reloadale object files
+         # after they are used.
+         i=0
+         while test "$i" -lt "$k"
+         do
+           i=`expr $i + 1`
+           delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+         done
+
+         $echo "creating a temporary reloadable object file: $output"
+
+         # Loop through the commands generated above and execute them.
+         save_ifs="$IFS"; IFS='~'
+         for cmd in $concat_cmds; do
+           IFS="$save_ifs"
+           $show "$cmd"
+           $run eval "$cmd" || exit $?
+         done
+         IFS="$save_ifs"
+
+         libobjs=$output
+         # Restore the value of output.
+         output=$save_output
+
+         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+         fi
+         # Expand the library linking commands again to reset the
+         # value of $libobjs for piecewise linking.
+
+         # Do each of the archive commands.
+         if test "$module" = yes && test -n "$module_cmds" ; then
+           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+             cmds=$module_expsym_cmds
+           else
+             cmds=$module_cmds
+           fi
+         else
+         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+           cmds=$archive_expsym_cmds
+         else
+           cmds=$archive_cmds
+           fi
+         fi
+
+         # Append the command to remove the reloadable object files
+         # to the just-reset $cmds.
+         eval cmds=\"\$cmds~\$rm $delfiles\"
        fi
-       IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
+       save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
+         eval cmd=\"$cmd\"
          $show "$cmd"
          $run eval "$cmd" || exit $?
        done
        IFS="$save_ifs"
 
+       # Restore the uninstalled library and exit
+       if test "$mode" = relink; then
+         $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+         exit $EXIT_SUCCESS
+       fi
+
        # Create links to the real library.
        for linkname in $linknames; do
          if test "$realname" != "$linkname"; then
@@ -2178,12 +3936,7 @@ EOF
       fi
       ;;
 
-    *.lo | *.o | *.obj)
-      if test -n "$link_against_libtool_libs"; then
-       $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
-       exit 1
-      fi
-
+    obj)
       if test -n "$deplibs"; then
        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
       fi
@@ -2208,11 +3961,11 @@ EOF
        $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
       fi
 
-      case "$output" in
+      case $output in
       *.lo)
-       if test -n "$objs"; then
+       if test -n "$objs$old_deplibs"; then
          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
        libobj="$output"
        obj=`$echo "X$output" | $Xsed -e "$lo2o"`
@@ -2234,7 +3987,7 @@ EOF
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
       # -Wl from whole_archive_flag_spec
-      wl= 
+      wl=
 
       if test -n "$convenience"; then
        if test -n "$whole_archive_flag_spec"; then
@@ -2243,17 +3996,17 @@ EOF
          gentop="$output_objdir/${obj}x"
          $show "${rm}r $gentop"
          $run ${rm}r "$gentop"
-         $show "mkdir $gentop"
-         $run mkdir "$gentop"
+         $show "$mkdir $gentop"
+         $run $mkdir "$gentop"
          status=$?
-         if test $status -ne 0 && test ! -d "$gentop"; then
+         if test "$status" -ne 0 && test ! -d "$gentop"; then
            exit $status
          fi
          generated="$generated $gentop"
 
          for xlib in $convenience; do
            # Extract the objects.
-           case "$xlib" in
+           case $xlib in
            [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
            *) xabs=`pwd`"/$xlib" ;;
            esac
@@ -2262,28 +4015,55 @@ EOF
 
            $show "${rm}r $xdir"
            $run ${rm}r "$xdir"
-           $show "mkdir $xdir"
-           $run mkdir "$xdir"
+           $show "$mkdir $xdir"
+           $run $mkdir "$xdir"
            status=$?
-           if test $status -ne 0 && test ! -d "$xdir"; then
+           if test "$status" -ne 0 && test ! -d "$xdir"; then
              exit $status
            fi
+           # We will extract separately just the conflicting names and we will no
+           # longer touch any unique names. It is faster to leave these extract
+           # automatically by $AR in one run.
            $show "(cd $xdir && $AR x $xabs)"
            $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+           if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+             :
+           else
+             $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+             $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+             $AR t "$xabs" | sort | uniq -cd | while read -r count name
+             do
+               i=1
+               while test "$i" -le "$count"
+               do
+                # Put our $i before any first dot (extension)
+                # Never overwrite any file
+                name_to="$name"
+                while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+                do
+                  name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+                done
+                $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+                $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+                i=`expr $i + 1`
+               done
+             done
+           fi
 
-           reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+           reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
          done
        fi
       fi
 
       # Create the old-style object.
-      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
-      eval cmds=\"$reload_cmds\"
-      IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
+       eval cmd=\"$cmd\"
        $show "$cmd"
        $run eval "$cmd" || exit $?
       done
@@ -2296,7 +4076,7 @@ EOF
          $run ${rm}r $gentop
        fi
 
-       exit 0
+       exit $EXIT_SUCCESS
       fi
 
       if test "$build_libtool_libs" != yes; then
@@ -2307,37 +4087,24 @@ EOF
 
        # Create an invalid libtool object if no PIC, so that we don't
        # accidentally link it into a program.
-       $show "echo timestamp > $libobj"
-       $run eval "echo timestamp > $libobj" || exit $?
-       exit 0
+       $show "echo timestamp > $libobj"
+       $run eval "echo timestamp > $libobj" || exit $?
+       exit $EXIT_SUCCESS
       fi
 
-      if test -n "$pic_flag"; then
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
        # Only do commands if we really have different PIC objects.
        reload_objs="$libobjs $reload_conv_objs"
        output="$libobj"
-       eval cmds=\"$reload_cmds\"
-       IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
+       cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
+         eval cmd=\"$cmd\"
          $show "$cmd"
          $run eval "$cmd" || exit $?
        done
        IFS="$save_ifs"
-      else
-       # Just create a symlink.
-       $show $rm $libobj
-       $run $rm $libobj
-       xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-       if test "X$xdir" = "X$libobj"; then
-         xdir="."
-       else
-         xdir="$xdir"
-       fi
-       baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-       oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-       $show "(cd $xdir && $LN_S $oldobj $baseobj)"
-       $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
       fi
 
       if test -n "$gentop"; then
@@ -2345,11 +4112,13 @@ EOF
        $run ${rm}r $gentop
       fi
 
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
 
-    # Anything else should be a program.
-    *)
+    prog)
+      case $host in
+       *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
       if test -n "$vinfo"; then
        $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
       fi
@@ -2359,20 +4128,37 @@ EOF
       fi
 
       if test "$preload" = yes; then
-       if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
+       if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
           test "$dlopen_self_static" = unknown; then
          $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-       fi 
+       fi
       fi
-    
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+       # On Rhapsody replace the C library is the System framework
+       compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+       finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+       ;;
+      esac
+
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
       if test -n "$rpath$xrpath"; then
        # If the user specified any rpath flags, then add them.
        for libdir in $rpath $xrpath; do
          # This is the magic to use -rpath.
-         case "$compile_rpath " in
-         *" $libdir "*) ;;
-         *) compile_rpath="$compile_rpath $libdir" ;;
-         esac
          case "$finalize_rpath " in
          *" $libdir "*) ;;
          *) finalize_rpath="$finalize_rpath $libdir" ;;
@@ -2390,7 +4176,7 @@ EOF
              hardcode_libdirs="$libdir"
            else
              # Just accumulate the unique libdirs.
-             case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
                ;;
              *)
@@ -2408,6 +4194,14 @@ EOF
          *) perm_rpath="$perm_rpath $libdir" ;;
          esac
        fi
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+         case :$dllsearchpath: in
+         *":$libdir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$libdir";;
+         esac
+         ;;
+       esac
       done
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
@@ -2426,7 +4220,7 @@ EOF
              hardcode_libdirs="$libdir"
            else
              # Just accumulate the unique libdirs.
-             case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
                ;;
              *)
@@ -2453,23 +4247,6 @@ EOF
       fi
       finalize_rpath="$rpath"
 
-      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$output_objdir" = "X$output"; then
-       output_objdir="$objdir"
-      else
-       output_objdir="$output_objdir/$objdir"
-      fi
-
-      # Create the binary in the object directory, then wrap it.
-      if test ! -d $output_objdir; then
-       $show "$mkdir $output_objdir"
-       $run $mkdir $output_objdir
-       status=$?
-       if test $status -ne 0 && test ! -d $output_objdir; then
-         exit $status
-       fi
-      fi
-
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
        # Transform all the library objects into standard objects.
        compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
@@ -2486,7 +4263,7 @@ EOF
       fi
 
       if test -n "$dlsyms"; then
-       case "$dlsyms" in
+       case $dlsyms in
        "") ;;
        *.c)
          # Discover the nlist of each of the dlfiles.
@@ -2518,19 +4295,19 @@ extern \"C\" {
            test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
 
            # Add our own program objects to the symbol list.
-           progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+           progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
            for arg in $progfiles; do
              $show "extracting global C symbols from \`$arg'"
              $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
            done
 
            if test -n "$exclude_expsyms"; then
-             $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+             $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
              $run eval '$mv "$nlist"T "$nlist"'
            fi
-           
+
            if test -n "$export_symbols_regex"; then
-             $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+             $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
              $run eval '$mv "$nlist"T "$nlist"'
            fi
 
@@ -2538,9 +4315,9 @@ extern \"C\" {
            if test -z "$export_symbols"; then
              export_symbols="$output_objdir/$output.exp"
              $run $rm $export_symbols
-             $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+             $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
            else
-             $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+             $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
              $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
              $run eval 'mv "$nlist"T "$nlist"'
            fi
@@ -2548,8 +4325,8 @@ extern \"C\" {
 
          for arg in $dlprefiles; do
            $show "extracting global C symbols from \`$arg'"
-           name=`echo "$arg" | sed -e 's%^.*/%%'`
-           $run eval 'echo ": $name " >> "$nlist"'
+           name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+           $run eval '$echo ": $name " >> "$nlist"'
            $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
          done
 
@@ -2558,12 +4335,18 @@ extern \"C\" {
            test -f "$nlist" || : > "$nlist"
 
            if test -n "$exclude_expsyms"; then
-             egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+             $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
              $mv "$nlist"T "$nlist"
            fi
 
            # Try sorting and uniquifying the output.
-           if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+           if grep -v "^: " < "$nlist" |
+               if sort -k 3 </dev/null >/dev/null 2>&1; then
+                 sort -k 3
+               else
+                 sort +2
+               fi |
+               uniq > "$nlist"S; then
              :
            else
              grep -v "^: " < "$nlist" > "$nlist"S
@@ -2572,7 +4355,7 @@ extern \"C\" {
            if test -f "$nlist"S; then
              eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
            else
-             echo '/* NONE */' >> "$output_objdir/$dlsyms"
+             $echo '/* NONE */' >> "$output_objdir/$dlsyms"
            fi
 
            $echo >> "$output_objdir/$dlsyms" "\
@@ -2580,27 +4363,25 @@ extern \"C\" {
 #undef lt_preloaded_symbols
 
 #if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
+# define lt_ptr void *
 #else
-# define lt_ptr_t char *
+# define lt_ptr char *
 # define const
 #endif
 
 /* The mapping between symbol names and symbols. */
 const struct {
   const char *name;
-  lt_ptr_t address;
+  lt_ptr address;
 }
 lt_preloaded_symbols[] =
 {\
 "
 
-           sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-               -e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-                 < "$nlist" >> "$output_objdir/$dlsyms"
+           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
 
            $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
+  {0, (lt_ptr) 0}
 };
 
 /* This works around a problem in FreeBSD linker */
@@ -2617,7 +4398,7 @@ static const void *lt_preloaded_setup() {
          fi
 
          pic_flag_for_symtable=
-         case "$host" in
+         case $host in
          # compiling the symbol table file with pic_flag works around
          # a FreeBSD bug that causes programs to crash when -lm is
          # linked before any other PIC object.  But we must not use
@@ -2626,18 +4407,18 @@ static const void *lt_preloaded_setup() {
          *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
            case "$compile_command " in
            *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
+           *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
            esac;;
          *-*-hpux*)
            case "$compile_command " in
            *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag -DPIC";;
+           *) pic_flag_for_symtable=" $pic_flag";;
            esac
          esac
 
          # Now compile the dynamic symbol file.
-         $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-         $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+         $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+         $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 
          # Clean up the generated files.
          $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
@@ -2649,7 +4430,7 @@ static const void *lt_preloaded_setup() {
          ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
       else
@@ -2662,7 +4443,7 @@ static const void *lt_preloaded_setup() {
        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
-      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
        # Replace the output file specification.
        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
        link_command="$compile_command$compile_rpath"
@@ -2671,7 +4452,7 @@ static const void *lt_preloaded_setup() {
        $show "$link_command"
        $run eval "$link_command"
        status=$?
-       
+
        # Delete the generated files.
        if test -n "$dlsyms"; then
          $show "$rm $output_objdir/${outputname}S.${objext}"
@@ -2685,7 +4466,7 @@ static const void *lt_preloaded_setup() {
        # We should set the shlibpath_var
        rpath=
        for dir in $temp_rpath; do
-         case "$dir" in
+         case $dir in
          [\\/]* | [A-Za-z]:[\\/]*)
            # Absolute path.
            rpath="$rpath$dir:"
@@ -2727,11 +4508,24 @@ static const void *lt_preloaded_setup() {
        fi
       fi
 
+      if test "$no_install" = yes; then
+       # We don't need to create a wrapper script.
+       link_command="$compile_var$compile_command$compile_rpath"
+       # Replace the output file specification.
+       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+       # Delete the old output file.
+       $run $rm $output
+       # Link the executable and exit
+       $show "$link_command"
+       $run eval "$link_command" || exit $?
+       exit $EXIT_SUCCESS
+      fi
+
       if test "$hardcode_action" = relink; then
        # Fast installation is not supported
        link_command="$compile_var$compile_command$compile_rpath"
        relink_command="$finalize_var$finalize_command$finalize_rpath"
-       
+
        $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
        $echo "$modename: \`$output' will be relinked during installation" 1>&2
       else
@@ -2751,7 +4545,7 @@ static const void *lt_preloaded_setup() {
 
       # Replace the output file specification.
       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-      
+
       # Delete the old output files.
       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
@@ -2763,14 +4557,26 @@ static const void *lt_preloaded_setup() {
 
       # Quote the relink command for shipping.
       if test -n "$relink_command"; then
+       # Preserve any variables that may affect compiler behavior
+       for var in $variables_saved_for_relink; do
+         if eval test -z \"\${$var+set}\"; then
+           relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+         elif eval var_value=\$$var; test -z "$var_value"; then
+           relink_command="$var=; export $var; $relink_command"
+         else
+           var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+           relink_command="$var=\"$var_value\"; export $var; $relink_command"
+         fi
+       done
+       relink_command="(cd `pwd`; $relink_command)"
        relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-       case "$0" in
-       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-       *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+       case $progpath in
+       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+       *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
        esac
        qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
@@ -2782,10 +4588,230 @@ static const void *lt_preloaded_setup() {
        # win32 will think the script is a binary if it has
        # a .exe suffix, so we strip it off here.
        case $output in
-         *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+         *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+       esac
+       # test for cygwin because mv fails w/o .exe extensions
+       case $host in
+         *cygwin*)
+           exeext=.exe
+           outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+         *) exeext= ;;
+       esac
+       case $host in
+         *cygwin* | *mingw* )
+           cwrappersource=`$echo ${objdir}/lt-${output}.c`
+           cwrapper=`$echo ${output}.exe`
+           $rm $cwrappersource $cwrapper
+           trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+           cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+           cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+char * basename (const char *name);
+char * fnqualify(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
+
+  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+  newargz = XMALLOC(char *, argc+2);
+EOF
+
+           cat >> $cwrappersource <<EOF
+  newargz[0] = "$SHELL";
+EOF
+
+           cat >> $cwrappersource <<"EOF"
+  newargz[1] = fnqualify(argv[0]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe");
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
+EOF
+
+           cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+
+           cat >> $cwrappersource <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+char *
+basename (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha (name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return (char *) base;
+}
+
+char *
+fnqualify(const char *path)
+{
+  size_t size;
+  char *p;
+  char tmp[LT_PATHMAX + 1];
+
+  assert(path != NULL);
+
+  /* Is it qualified already? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha (path[0]) && path[1] == ':')
+    return xstrdup (path);
+#endif
+  if (IS_DIR_SEPARATOR (path[0]))
+    return xstrdup (path);
+
+  /* prepend the current directory */
+  /* doesn't handle '~' */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+  p = XMALLOC(char, size);
+  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+  return p;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+         # we should really use a build-platform specific compiler
+         # here, but OTOH, the wrappers (shell script and this C one)
+         # are only useful if you want to execute the "real" binary.
+         # Since the "real" binary is built for $host, then this
+         # wrapper might as well be built for $host, too.
+         $run $LTCC -s -o $cwrapper $cwrappersource
+         ;;
        esac
        $rm $output
-       trap "$rm $output; exit 1" 1 2 15
+       trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
        $echo > $output "\
 #! $SHELL
@@ -2801,7 +4827,7 @@ static const void *lt_preloaded_setup() {
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -2813,7 +4839,7 @@ relink_command=\"$relink_command\"
 # This environment variable determines our operation mode.
 if test \"\$libtool_install_magic\" = \"$magic\"; then
   # install mode needs the following variable:
-  link_against_libtool_libs='$link_against_libtool_libs'
+  notinst_deplibs='$notinst_deplibs'
 else
   # When we are sourced in execute mode, \$file and \$echo are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -2839,20 +4865,20 @@ else
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
       case \"\$destdir\" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;;
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
       *) thisdir=\"\$thisdir/\$destdir\" ;;
       esac
     fi
 
     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
 
   # Try to get the absolute directory name.
@@ -2861,12 +4887,12 @@ else
 "
 
        if test "$fast_install" = yes; then
-         echo >> $output "\
-  program=lt-'$outputname'
+         $echo >> $output "\
+  program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
-  
+
   if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -2877,14 +4903,15 @@ else
       $rm \"\$progdir/\$file\"
     fi"
 
-         echo >> $output "\
+         $echo >> $output "\
 
     # relink executable if necessary
     if test -n \"\$relink_command\"; then
-      if (cd \"\$thisdir\" && eval \$relink_command); then :
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
+       $echo \"\$relink_command_output\" >&2
        $rm \"\$progdir/\$file\"
-       exit 1
+       exit $EXIT_FAILURE
       fi
     fi
 
@@ -2894,13 +4921,13 @@ else
     $rm \"\$progdir/\$file\"
   fi"
        else
-         echo >> $output "\
+         $echo >> $output "\
   program='$outputname'
   progdir=\"\$thisdir/$objdir\"
 "
        fi
 
-       echo >> $output "\
+       $echo >> $output "\
 
   if test -f \"\$progdir/\$program\"; then"
 
@@ -2931,14 +4958,6 @@ else
       # Run the actual program with our arguments.
 "
        case $host in
-         # win32 systems need to use the prog path for dll
-         # lookup to work
-       *-*-cygwin*)
-         $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-         ;;
-
        # Backslashes separate directories on plain windows
        *-*-mingw | *-*-os2*)
          $echo >> $output "\
@@ -2948,30 +4967,26 @@ else
 
        *)
          $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
+      exec \$progdir/\$program \${1+\"\$@\"}
 "
          ;;
        esac
        $echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
+      exit $EXIT_FAILURE
     fi
   else
     # The program doesn't exist.
     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit $EXIT_FAILURE
   fi
 fi\
 "
        chmod +x $output
       fi
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
     esac
 
@@ -2987,7 +5002,7 @@ fi\
          oldobjs="$libobjs_save"
          build_libtool_libs=no
        else
-         oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+         oldobjs="$old_deplibs $non_pic_objects"
        fi
        addlibs="$old_convenience"
       fi
@@ -2996,18 +5011,18 @@ fi\
        gentop="$output_objdir/${outputname}x"
        $show "${rm}r $gentop"
        $run ${rm}r "$gentop"
-       $show "mkdir $gentop"
-       $run mkdir "$gentop"
+       $show "$mkdir $gentop"
+       $run $mkdir "$gentop"
        status=$?
-       if test $status -ne 0 && test ! -d "$gentop"; then
+       if test "$status" -ne 0 && test ! -d "$gentop"; then
          exit $status
        fi
        generated="$generated $gentop"
-         
+
        # Add in members from convenience archives.
        for xlib in $addlibs; do
          # Extract the objects.
-         case "$xlib" in
+         case $xlib in
          [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
          *) xabs=`pwd`"/$xlib" ;;
          esac
@@ -3016,14 +5031,40 @@ fi\
 
          $show "${rm}r $xdir"
          $run ${rm}r "$xdir"
-         $show "mkdir $xdir"
-         $run mkdir "$xdir"
+         $show "$mkdir $xdir"
+         $run $mkdir "$xdir"
          status=$?
-         if test $status -ne 0 && test ! -d "$xdir"; then
+         if test "$status" -ne 0 && test ! -d "$xdir"; then
            exit $status
          fi
+         # We will extract separately just the conflicting names and we will no
+         # longer touch any unique names. It is faster to leave these extract
+         # automatically by $AR in one run.
          $show "(cd $xdir && $AR x $xabs)"
          $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+         if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+           :
+         else
+           $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+           $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+           $AR t "$xabs" | sort | uniq -cd | while read -r count name
+           do
+             i=1
+             while test "$i" -le "$count"
+             do
+              # Put our $i before any first dot (extension)
+              # Never overwrite any file
+              name_to="$name"
+              while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+              do
+                name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+              done
+              $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+              $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+              i=`expr $i + 1`
+             done
+           done
+         fi
 
          oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
        done
@@ -3031,30 +5072,71 @@ fi\
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       eval cmds=\"$old_archive_from_new_cmds\"
+       cmds=$old_archive_from_new_cmds
       else
-       # Ensure that we have .o objects in place in case we decided
-       # not to build a shared library, and have fallen back to building
-       # static libs even though --disable-static was passed!
-       for oldobj in $oldobjs; do
-         if test ! -f $oldobj; then
-           xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-           if test "X$xdir" = "X$oldobj"; then
-             xdir="."
+       eval cmds=\"$old_archive_cmds\"
+
+       if len=`expr "X$cmds" : ".*"` &&
+            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         cmds=$old_archive_cmds
+       else
+         # the command line is too long to link in one step, link in parts
+         $echo "using piecewise archive linking..."
+         save_RANLIB=$RANLIB
+         RANLIB=:
+         objlist=
+         concat_cmds=
+         save_oldobjs=$oldobjs
+         # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+         # encoded into archives.  This makes 'ar r' malfunction in
+         # this piecewise linking case whenever conflicting object
+         # names appear in distinct ar calls; check, warn and compensate.
+           if (for obj in $save_oldobjs
+           do
+             $echo "X$obj" | $Xsed -e 's%^.*/%%'
+           done | sort | sort -uc >/dev/null 2>&1); then
+           :
+         else
+           $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+           $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+           AR_FLAGS=cq
+         fi
+         # Is there a better way of finding the last object in the list?
+         for obj in $save_oldobjs
+         do
+           last_oldobj=$obj
+         done
+         for obj in $save_oldobjs
+         do
+           oldobjs="$objlist $obj"
+           objlist="$objlist $obj"
+           eval test_cmds=\"$old_archive_cmds\"
+           if len=`expr "X$test_cmds" : ".*"` &&
+              test "$len" -le "$max_cmd_len"; then
+             :
            else
-             xdir="$xdir"
+             # the above command should be used before it gets too long
+             oldobjs=$objlist
+             if test "$obj" = "$last_oldobj" ; then
+               RANLIB=$save_RANLIB
+             fi
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+             objlist=
            fi
-           baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-           obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-           $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-           $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
+         done
+         RANLIB=$save_RANLIB
+         oldobjs=$objlist
+         if test "X$oldobjs" = "X" ; then
+           eval cmds=\"\$concat_cmds\"
+         else
+           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
          fi
-       done
-
-       eval cmds=\"$old_archive_cmds\"
+       fi
       fi
-      IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
+        eval cmd=\"$cmd\"
        IFS="$save_ifs"
        $show "$cmd"
        $run eval "$cmd" || exit $?
@@ -3068,20 +5150,31 @@ fi\
     fi
 
     # Now create the libtool archive.
-    case "$output" in
+    case $output in
     *.la)
       old_library=
       test "$build_old_libs" = yes && old_library="$libname.$libext"
       $show "creating $output"
 
-      if test -n "$xrpath"; then
-       temp_xrpath=
-       for libdir in $xrpath; do
-         temp_xrpath="$temp_xrpath -R$libdir"
-       done
-       dependency_libs="$temp_xrpath $dependency_libs"
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+       if eval test -z \"\${$var+set}\"; then
+         relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+       elif eval var_value=\$$var; test -z "$var_value"; then
+         relink_command="$var=; export $var; $relink_command"
+       else
+         var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+         relink_command="$var=\"$var_value\"; export $var; $relink_command"
+       fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+       relink_command=
       fi
 
+
       # Only create the output if not a dry run.
       if test -z "$run"; then
        for installed in no yes; do
@@ -3090,8 +5183,71 @@ fi\
              break
            fi
            output="$output_objdir/$outputname"i
+           # Replace all uninstalled libtool libraries with the installed ones
+           newdependency_libs=
+           for deplib in $dependency_libs; do
+             case $deplib in
+             *.la)
+               name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+               if test -z "$libdir"; then
+                 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+                 exit $EXIT_FAILURE
+               fi
+               newdependency_libs="$newdependency_libs $libdir/$name"
+               ;;
+             *) newdependency_libs="$newdependency_libs $deplib" ;;
+             esac
+           done
+           dependency_libs="$newdependency_libs"
+           newdlfiles=
+           for lib in $dlfiles; do
+             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+             if test -z "$libdir"; then
+               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+               exit $EXIT_FAILURE
+             fi
+             newdlfiles="$newdlfiles $libdir/$name"
+           done
+           dlfiles="$newdlfiles"
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+             if test -z "$libdir"; then
+               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+               exit $EXIT_FAILURE
+             fi
+             newdlprefiles="$newdlprefiles $libdir/$name"
+           done
+           dlprefiles="$newdlprefiles"
+         else
+           newdlfiles=
+           for lib in $dlfiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             newdlfiles="$newdlfiles $abs"
+           done
+           dlfiles="$newdlfiles"
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             newdlprefiles="$newdlprefiles $abs"
+           done
+           dlprefiles="$newdlprefiles"
          fi
          $rm $output
+         # place dlname in correct position for cygwin
+         tdlname=$dlname
+         case $host,$output,$installed,$module,$dlname in
+           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+         esac
          $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
@@ -3100,7 +5256,7 @@ fi\
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='$dlname'
+dlname='$tdlname'
 
 # Names of this library.
 library_names='$library_names'
@@ -3119,19 +5275,29 @@ revision=$revision
 # Is this an already installed library?
 installed=$installed
 
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
 # Directory that this library needs to be installed in:
-libdir='$install_libdir'\
-"
+libdir='$install_libdir'"
+         if test "$installed" = no && test "$need_relink" = yes; then
+           $echo >> $output "\
+relink_command=\"$relink_command\""
+         fi
        done
       fi
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
       $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool install mode
@@ -3140,10 +5306,12 @@ libdir='$install_libdir'\
 
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case "$arg" in
+      case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*)
        arg="\"$arg\""
        ;;
@@ -3159,7 +5327,7 @@ libdir='$install_libdir'\
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case "$arg" in
+    case $arg in
     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \      ]*|*]*)
       arg="\"$arg\""
       ;;
@@ -3182,7 +5350,7 @@ libdir='$install_libdir'\
        continue
       fi
 
-      case "$arg" in
+      case $arg in
       -d) isdir=yes ;;
       -f) prev="-f" ;;
       -g) prev="-g" ;;
@@ -3207,7 +5375,7 @@ libdir='$install_libdir'\
 
       # Aesthetically quote the argument.
       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case "$arg" in
+      case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*)
        arg="\"$arg\""
        ;;
@@ -3218,13 +5386,13 @@ libdir='$install_libdir'\
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -z "$files"; then
@@ -3234,7 +5402,7 @@ libdir='$install_libdir'\
        $echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Strip any trailing slash from the destination.
@@ -3252,22 +5420,22 @@ libdir='$install_libdir'\
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files
-      if test $# -gt 2; then
+      if test "$#" -gt 2; then
        $echo "$modename: \`$dest' is not a directory" 1>&2
        $echo "$help" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
       fi
     fi
-    case "$destdir" in
+    case $destdir in
     [\\/]* | [A-Za-z]:[\\/]*) ;;
     *)
       for file in $files; do
-       case "$file" in
+       case $file in
        *.lo) ;;
        *)
          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
       done
@@ -3284,25 +5452,26 @@ libdir='$install_libdir'\
     for file in $files; do
 
       # Do each installation.
-      case "$file" in
-      *.a | *.lib)
+      case $file in
+      *.$libext)
        # Do the static libraries later.
        staticlibs="$staticlibs $file"
        ;;
 
       *.la)
        # Check to see that this really is a libtool archive.
-       if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
        else
          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
 
        library_names=
        old_library=
+       relink_command=
        # If there is no directory component, then add one.
-       case "$file" in
+       case $file in
        */* | *\\*) . $file ;;
        *) . ./$file ;;
        esac
@@ -3321,10 +5490,41 @@ libdir='$install_libdir'\
          esac
        fi
 
-       dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
+       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
        test "X$dir" = "X$file/" && dir=
        dir="$dir$objdir"
 
+       if test -n "$relink_command"; then
+         # Determine the prefix the user has applied to our future dir.
+         inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+         # Don't allow the user to place us outside of our expected
+         # location b/c this prevents finding dependent libraries that
+         # are installed to the same prefix.
+         # At present, this check doesn't affect windows .dll's that
+         # are installed into $libdir/../bin (currently, that works fine)
+         # but it's something to keep an eye on.
+         if test "$inst_prefix_dir" = "$destdir"; then
+           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+           exit $EXIT_FAILURE
+         fi
+
+         if test -n "$inst_prefix_dir"; then
+           # Stick the inst_prefix_dir data into the link command.
+           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+         else
+           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+         fi
+
+         $echo "$modename: warning: relinking \`$file'" 1>&2
+         $show "$relink_command"
+         if $run eval "$relink_command"; then :
+         else
+           $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+           exit $EXIT_FAILURE
+         fi
+       fi
+
        # See the names of the shared library.
        set dummy $library_names
        if test -n "$2"; then
@@ -3332,11 +5532,18 @@ libdir='$install_libdir'\
          shift
          shift
 
+         srcname="$realname"
+         test -n "$relink_command" && srcname="$realname"T
+
          # Install the shared library and build the symlinks.
-         $show "$install_prog $dir/$realname $destdir/$realname"
-         $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
+         $show "$install_prog $dir/$srcname $destdir/$realname"
+         $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+         if test -n "$stripme" && test -n "$striplib"; then
+           $show "$striplib $destdir/$realname"
+           $run eval "$striplib $destdir/$realname" || exit $?
+         fi
 
-         if test $# -gt 0; then
+         if test "$#" -gt 0; then
            # Delete the old symlinks, and create new ones.
            for linkname
            do
@@ -3349,10 +5556,11 @@ libdir='$install_libdir'\
 
          # Do each command in the postinstall commands.
          lib="$destdir/$realname"
-         eval cmds=\"$postinstall_cmds\"
-         IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
+         cmds=$postinstall_cmds
+         save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
+           eval cmd=\"$cmd\"
            $show "$cmd"
            $run eval "$cmd" || exit $?
          done
@@ -3381,18 +5589,18 @@ libdir='$install_libdir'\
        fi
 
        # Deduce the name of the destination old-style object file.
-       case "$destfile" in
+       case $destfile in
        *.lo)
          staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
          ;;
-       *.o | *.obj)
+       *.$objext)
          staticdest="$destfile"
          destfile=
          ;;
        *)
          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
          ;;
        esac
 
@@ -3410,7 +5618,7 @@ libdir='$install_libdir'\
          $show "$install_prog $staticobj $staticdest"
          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
        fi
-       exit 0
+       exit $EXIT_SUCCESS
        ;;
 
       *)
@@ -3422,56 +5630,99 @@ libdir='$install_libdir'\
          destfile="$destdir/$destfile"
        fi
 
+       # If the file is missing, and there is a .exe on the end, strip it
+       # because it is most likely a libtool script we actually want to
+       # install
+       stripped_ext=""
+       case $file in
+         *.exe)
+           if test ! -f "$file"; then
+             file=`$echo $file|${SED} 's,.exe$,,'`
+             stripped_ext=".exe"
+           fi
+           ;;
+       esac
+
        # Do a test to see if this is really a libtool program.
-       if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         link_against_libtool_libs=
+       case $host in
+       *cygwin*|*mingw*)
+           wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+           ;;
+       *)
+           wrapper=$file
+           ;;
+       esac
+       if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+         notinst_deplibs=
          relink_command=
 
+         # To insure that "foo" is sourced, and not "foo.exe",
+         # finese the cygwin/MSYS system by explicitly sourcing "foo."
+         # which disallows the automatic-append-.exe behavior.
+         case $build in
+         *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+         *) wrapperdot=${wrapper} ;;
+         esac
          # If there is no directory component, then add one.
-         case "$file" in
-         */* | *\\*) . $file ;;
-         *) . ./$file ;;
+         case $file in
+         */* | *\\*) . ${wrapperdot} ;;
+         *) . ./${wrapperdot} ;;
          esac
 
          # Check the variables that should have been set.
-         if test -z "$link_against_libtool_libs"; then
-           $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-           exit 1
+         if test -z "$notinst_deplibs"; then
+           $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+           exit $EXIT_FAILURE
          fi
 
          finalize=yes
-         for lib in $link_against_libtool_libs; do
+         for lib in $notinst_deplibs; do
            # Check to see that each library is installed.
            libdir=
            if test -f "$lib"; then
              # If there is no directory component, then add one.
-             case "$lib" in
+             case $lib in
              */* | *\\*) . $lib ;;
              *) . ./$lib ;;
              esac
            fi
-           libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
+           libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
            if test -n "$libdir" && test ! -f "$libfile"; then
              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
              finalize=no
            fi
          done
 
+         relink_command=
+         # To insure that "foo" is sourced, and not "foo.exe",
+         # finese the cygwin/MSYS system by explicitly sourcing "foo."
+         # which disallows the automatic-append-.exe behavior.
+         case $build in
+         *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+         *) wrapperdot=${wrapper} ;;
+         esac
+         # If there is no directory component, then add one.
+         case $file in
+         */* | *\\*) . ${wrapperdot} ;;
+         *) . ./${wrapperdot} ;;
+         esac
+
          outputname=
          if test "$fast_install" = no && test -n "$relink_command"; then
            if test "$finalize" = yes && test -z "$run"; then
              tmpdir="/tmp"
              test -n "$TMPDIR" && tmpdir="$TMPDIR"
-              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-              if test $? = 0 ; then :
-              else
-                tmpdir="$tmpdir/libtool-$$"
-              fi
-             if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+             tmpdir="$tmpdir/libtool-$$"
+             save_umask=`umask`
+             umask 0077
+             if $mkdir "$tmpdir"; then
+               umask $save_umask
              else
+               umask $save_umask
                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
                continue
              fi
+             file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
              outputname="$tmpdir/$file"
              # Replace the output file specification.
              relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
@@ -3489,10 +5740,27 @@ libdir='$install_libdir'\
            fi
          else
            # Install the binary that we compiled earlier.
-           file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+           file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
          fi
        fi
 
+       # remove .exe since cygwin /usr/bin/install will append another
+       # one anyways
+       case $install_prog,$host in
+       */usr/bin/install*,*cygwin*)
+         case $file:$destfile in
+         *.exe:*.exe)
+           # this is ok
+           ;;
+         *.exe:*)
+           destfile=$destfile.exe
+           ;;
+         *:*.exe)
+           destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+           ;;
+         esac
+         ;;
+       esac
        $show "$install_prog$stripme $file $destfile"
        $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
        test -n "$outputname" && ${rm}r "$tmpdir"
@@ -3509,11 +5777,17 @@ libdir='$install_libdir'\
       $show "$install_prog $file $oldlib"
       $run eval "$install_prog \$file \$oldlib" || exit $?
 
+      if test -n "$stripme" && test -n "$old_striplib"; then
+       $show "$old_striplib $oldlib"
+       $run eval "$old_striplib $oldlib" || exit $?
+      fi
+
       # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
+       eval cmd=\"$cmd\"
        $show "$cmd"
        $run eval "$cmd" || exit $?
       done
@@ -3527,11 +5801,10 @@ libdir='$install_libdir'\
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec $SHELL $0 --finish$current_libdirs
-      exit 1
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
     fi
-
-    exit 0
     ;;
 
   # libtool finish mode
@@ -3549,10 +5822,11 @@ libdir='$install_libdir'\
       for libdir in $libdirs; do
        if test -n "$finish_cmds"; then
          # Do each command in the finish commands.
-         eval cmds=\"$finish_cmds\"
-         IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
+         cmds=$finish_cmds
+         save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
+           eval cmd=\"$cmd\"
            $show "$cmd"
            $run eval "$cmd" || admincmds="$admincmds
        $cmd"
@@ -3569,43 +5843,43 @@ libdir='$install_libdir'\
     fi
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
+    test "$show" = : && exit $EXIT_SUCCESS
 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
+    $echo "----------------------------------------------------------------------"
+    $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
-      echo "   $libdir"
+      $echo "   $libdir"
     done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
     if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
     fi
     if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
     fi
     if test -n "$hardcode_libdir_flag_spec"; then
       libdir=LIBDIR
       eval flag=\"$hardcode_libdir_flag_spec\"
 
-      echo "   - use the \`$flag' linker flag"
+      $echo "   - use the \`$flag' linker flag"
     fi
     if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
+      $echo "   - have your system administrator run these commands:$admincmds"
     fi
     if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
     fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
-    exit 0
+    $echo
+    $echo "See any operating system documentation about shared libraries for"
+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    $echo "----------------------------------------------------------------------"
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool execute mode
@@ -3617,7 +5891,7 @@ libdir='$install_libdir'\
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Handle -dlopen flags immediately.
@@ -3625,18 +5899,18 @@ libdir='$install_libdir'\
       if test ! -f "$file"; then
        $echo "$modename: \`$file' is not a file" 1>&2
        $echo "$help" 1>&2
-       exit 1
+       exit $EXIT_FAILURE
       fi
 
       dir=
-      case "$file" in
+      case $file in
       *.la)
        # Check to see that this really is a libtool archive.
-       if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
 
        # Read the libtool library.
@@ -3644,7 +5918,7 @@ libdir='$install_libdir'\
        library_names=
 
        # If there is no directory component, then add one.
-       case "$file" in
+       case $file in
        */* | *\\*) . $file ;;
        *) . ./$file ;;
        esac
@@ -3663,7 +5937,7 @@ libdir='$install_libdir'\
          dir="$dir/$objdir"
        else
          $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-         exit 1
+         exit $EXIT_FAILURE
        fi
        ;;
 
@@ -3699,13 +5973,13 @@ libdir='$install_libdir'\
     args=
     for file
     do
-      case "$file" in
+      case $file in
       -*) ;;
       *)
        # Do a test to see if this is really a libtool program.
-       if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+       if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
          # If there is no directory component, then add one.
-         case "$file" in
+         case $file in
          */* | *\\*) . $file ;;
          *) . ./$file ;;
          esac
@@ -3722,11 +5996,11 @@ libdir='$install_libdir'\
 
     if test -z "$run"; then
       if test -n "$shlibpath_var"; then
-        # Export the shlibpath_var.
-        eval "export $shlibpath_var"
+       # Export the shlibpath_var.
+       eval "export $shlibpath_var"
       fi
 
-      # Restore saved enviroment variables
+      # Restore saved environment variables
       if test "${save_LC_ALL+set}" = set; then
        LC_ALL="$save_LC_ALL"; export LC_ALL
       fi
@@ -3734,31 +6008,35 @@ libdir='$install_libdir'\
        LANG="$save_LANG"; export LANG
       fi
 
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
-        eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-        $echo "export $shlibpath_var"
+       eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+       $echo "export $shlibpath_var"
       fi
       $echo "$cmd$args"
-      exit 0
+      exit $EXIT_SUCCESS
     fi
     ;;
 
-  # libtool uninstall mode
-  uninstall)
-    modename="$modename: uninstall"
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
     rm="$nonopt"
     files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
 
     for arg
     do
-      case "$arg" in
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
       -*) rm="$rm $arg" ;;
       *) files="$files $arg" ;;
       esac
@@ -3767,91 +6045,183 @@ libdir='$install_libdir'\
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
+    rmdirs=
+
+    origobjdir="$objdir"
     for file in $files; do
       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$dir" = "X$file" && dir=.
+      if test "X$dir" = "X$file"; then
+       dir=.
+       objdir="$origobjdir"
+      else
+       objdir="$dir/$origobjdir"
+      fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+       case " $rmdirs " in
+         *" $objdir "*) ;;
+         *) rmdirs="$rmdirs $objdir" ;;
+       esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+       || (test -h "$file") >/dev/null 2>&1 \
+       || test -f "$file"; then
+       :
+      elif test -d "$file"; then
+       exit_status=1
+       continue
+      elif test "$rmforce" = yes; then
+       continue
+      fi
 
       rmfiles="$file"
 
-      case "$name" in
+      case $name in
       *.la)
        # Possibly a libtool archive, so verify it.
-       if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
          . $dir/$name
 
          # Delete the libtool libraries and symlinks.
          for n in $library_names; do
-           rmfiles="$rmfiles $dir/$n"
+           rmfiles="$rmfiles $objdir/$n"
          done
-         test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
-
-         $show "$rm $rmfiles"
-         $run $rm $rmfiles
-
-         if test -n "$library_names"; then
-           # Do each command in the postuninstall commands.
-           eval cmds=\"$postuninstall_cmds\"
-           IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
-           for cmd in $cmds; do
+         test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+         test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+         if test "$mode" = uninstall; then
+           if test -n "$library_names"; then
+             # Do each command in the postuninstall commands.
+             cmds=$postuninstall_cmds
+             save_ifs="$IFS"; IFS='~'
+             for cmd in $cmds; do
+               IFS="$save_ifs"
+               eval cmd=\"$cmd\"
+               $show "$cmd"
+               $run eval "$cmd"
+               if test "$?" -ne 0 && test "$rmforce" != yes; then
+                 exit_status=1
+               fi
+             done
              IFS="$save_ifs"
-             $show "$cmd"
-             $run eval "$cmd"
-           done
-           IFS="$save_ifs"
-         fi
+           fi
 
-         if test -n "$old_library"; then
-           # Do each command in the old_postuninstall commands.
-           eval cmds=\"$old_postuninstall_cmds\"
-           IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
-           for cmd in $cmds; do
+           if test -n "$old_library"; then
+             # Do each command in the old_postuninstall commands.
+             cmds=$old_postuninstall_cmds
+             save_ifs="$IFS"; IFS='~'
+             for cmd in $cmds; do
+               IFS="$save_ifs"
+               eval cmd=\"$cmd\"
+               $show "$cmd"
+               $run eval "$cmd"
+               if test "$?" -ne 0 && test "$rmforce" != yes; then
+                 exit_status=1
+               fi
+             done
              IFS="$save_ifs"
-             $show "$cmd"
-             $run eval "$cmd"
-           done
-           IFS="$save_ifs"
+           fi
+           # FIXME: should reinstall the best remaining shared library.
          fi
-
-         # FIXME: should reinstall the best remaining shared library.
        fi
        ;;
 
       *.lo)
-       if test "$build_old_libs" = yes; then
-         oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-         rmfiles="$rmfiles $dir/$oldobj"
+       # Possibly a libtool object, so verify it.
+       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+         # Read the .lo file
+         . $dir/$name
+
+         # Add PIC object to the list of files to remove.
+         if test -n "$pic_object" \
+            && test "$pic_object" != none; then
+           rmfiles="$rmfiles $dir/$pic_object"
+         fi
+
+         # Add non-PIC object to the list of files to remove.
+         if test -n "$non_pic_object" \
+            && test "$non_pic_object" != none; then
+           rmfiles="$rmfiles $dir/$non_pic_object"
+         fi
        fi
-       $show "$rm $rmfiles"
-       $run $rm $rmfiles
        ;;
 
       *)
-       $show "$rm $rmfiles"
-       $run $rm $rmfiles
+       if test "$mode" = clean ; then
+         noexename=$name
+         case $file in
+         *.exe)
+           file=`$echo $file|${SED} 's,.exe$,,'`
+           noexename=`$echo $name|${SED} 's,.exe$,,'`
+           # $file with .exe has already been added to rmfiles,
+           # add $file without .exe
+           rmfiles="$rmfiles $file"
+           ;;
+         esac
+         # Do a test to see if this is a libtool program.
+         if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+           relink_command=
+           . $dir/$noexename
+
+           # note $name still contains .exe if it was in $file originally
+           # as does the version of $file that was added into $rmfiles
+           rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+           if test "$fast_install" = yes && test -n "$relink_command"; then
+             rmfiles="$rmfiles $objdir/lt-$name"
+           fi
+           if test "X$noexename" != "X$name" ; then
+             rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+           fi
+         fi
+       fi
        ;;
       esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+       $show "rmdir $dir"
+       $run rmdir $dir >/dev/null 2>&1
+      fi
     done
-    exit 0
+
+    exit $exit_status
     ;;
 
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+  fi
 fi # test -z "$show_help"
 
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit $EXIT_FAILURE
+fi
+
 # We need to display help for each of the modes.
-case "$mode" in
+case $mode in
 "") $echo \
 "Usage: $modename [OPTION]... [MODE-ARG]...
 
@@ -3866,10 +6236,12 @@ Provide generalized library-building support services.
     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
     --quiet           same as \`--silent'
     --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
     --version         print version information
 
 MODE must be one of the following:
 
+      clean           remove files from the build directory
       compile         compile a source file into a libtool object
       execute         automatically set library path, then run a program
       finish          complete the installation of libtool libraries
@@ -3878,8 +6250,24 @@ MODE must be one of the following:
       uninstall       remove libraries from an installed directory
 
 MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit $EXIT_SUCCESS
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
   ;;
 
 compile)
@@ -3891,6 +6279,8 @@ Compile a source file into a libtool library object.
 This mode accepts the following additional options:
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
   -static           always build a \`.o' file suitable for static linking
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
@@ -3970,8 +6360,13 @@ The following components of LINK-COMMAND are treated specially:
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
@@ -4013,14 +6408,34 @@ Otherwise, only FILE itself is deleted using RM."
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
-echo
+$echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $EXIT_SUCCESS
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
index 8157d677d18b8ea404667e66b2ef6f74f89b75a7..e4a61870b1284ea3e77b784b5490cbb1f3e3a9d9 100644 (file)
@@ -103,4 +103,4 @@ fi
 ])
 
 # AC_DISABLE_DEBUG - set the default flag to --disable-debug
-AC_DEFUN([AC_DISABLE_DEBUG], [AC_ENABLE_DEBUG(no)])
\ No newline at end of file
+AC_DEFUN([AC_DISABLE_DEBUG], [AC_ENABLE_DEBUG(no)])
index 220be3f5ead6e451916d02ff1c63a12c43584db7..007845b44249b1505955a9aa92583ba54c214d45 100644 (file)
@@ -16,7 +16,7 @@ salomescriptdir    = $(bindir)
 salomeidldir       = $(prefix)/idl/@PACKAGE@
 
 # Directory for installing resource files
-salomeresdir       = $(prefix)/share/@PACKAGE@/resources
+salomeresdir       = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
 
 # Directories for installing admin files
 salomeadmdir       = $(prefix)/salome_adm
index 125611351c694c94f1fca33677cd3a610f15fdaa..bd9a9f294e6f129113b02653e58220bd98f12387 100644 (file)
@@ -54,7 +54,7 @@ namespace Batch {
     Parametre();
 
     // Constructeur par recopie
-    Parametre::Parametre(const Parametre & PM);
+    Parametre(const Parametre & PM);
 
     // Operateur de recherche dans la map
     Versatile & operator [] (const string &);
index d022973ca1d52f2e7311482bfee97bf16ca29090..b9bf740a35b04920c3d33031be18d3b76c29007b 100644 (file)
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-@COMMENCE@
+@SET_MAKE@
 
-EXPORT_PYSCRIPTS = 
+#
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
 
-EXPORT_HEADERS = \
+
+SOURCES = $(libSalomeCommunication_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(salomeinclude_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+subdir = ./src/Communication
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" \
+       "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 = ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+am__DEPENDENCIES_2 =
+libSalomeCommunication_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2)
+am_libSalomeCommunication_la_OBJECTS =  \
+       libSalomeCommunication_la-SALOME_Comm_i.lo \
+       libSalomeCommunication_la-SALOME_Matrix_i.lo \
+       libSalomeCommunication_la-SenderFactory.lo \
+       libSalomeCommunication_la-MultiCommException.lo \
+       libSalomeCommunication_la-SALOMEMultiComm.lo \
+       libSalomeCommunication_la-ReceiverFactory.lo \
+       libSalomeCommunication_la-MatrixClient.lo
+libSalomeCommunication_la_OBJECTS =  \
+       $(am_libSalomeCommunication_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libSalomeCommunication_la_SOURCES)
+DIST_SOURCES = $(libSalomeCommunication_la_SOURCES)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
+
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
+
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 
+
+#
+# ===============================================================
+# Files to be installed
+# ===============================================================
+#
+# header files  
+salomeinclude_HEADERS = \
        ReceiverFactory.hxx \
        SenderFactory.hxx \
        SALOMEMultiComm.hxx \
        MultiCommException.hxx \
        SALOME_Comm_i.hxx \
+       MatrixClient.hxx \
+       SALOME_Matrix_i.hxx \
        SALOME_Communication.hxx
 
+
+# Scripts to be installed
+
+#
+# ===============================================================
+# Local definitions
+# ===============================================================
+#
+
+# This local variable defines the list of CPPFLAGS common to all target in this package.
+COMMON_CPPFLAGS = \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../Utils \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+
+# This local variable defines the list of dependant libraries common to all target in this package.
+COMMON_LIBS = \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+
+
+# _CS_gbo The need for these flags depends on wether the swig
+# interface is generated and if MPI is activated.
+OPT_CPPFLAGS = @PYTHON_INCLUDES@  @MPI_INCLUDES@
+OPT_LIBS = @PYTHON_LIBS@ @MPI_LIBS@
+OPT_LDFLAGS = -Xlinker -export-dynamic
+
+#
+# ===============================================================
 # Libraries targets
+# ===============================================================
+#
+lib_LTLIBRARIES = libSalomeCommunication.la 
+libSalomeCommunication_la_SOURCES = \
+       SALOME_Comm_i.cxx \
+       SALOME_Matrix_i.cxx \
+       SenderFactory.cxx \
+       MultiCommException.cxx \
+       SALOMEMultiComm.cxx \
+       ReceiverFactory.cxx \
+       MatrixClient.cxx \
+       \
+       MultiCommException.hxx \
+       SALOME_Comm_i.hxx \
+       SALOME_Matrix_i.hxx \
+       SenderFactory.hxx \
+       ReceiverFactory.hxx \
+        MatrixClient.hxx \
+       SALOMEMultiComm.hxx \
+       Receivers.hxx \
+       Receiver.hxx
 
-LIB = libSalomeCommunication.la 
-LIB_SRC = SALOME_Comm_i.cxx  SenderFactory.cxx MultiCommException.cxx SALOMEMultiComm.cxx ReceiverFactory.cxx
-LIB_SERVER_IDL = SALOME_Comm.idl SALOME_Exception.idl
 
-# Executables targets
-BIN = 
-BIN_SRC =
-BIN_SERVER_IDL = 
+# the following file is needed by an include file (VERY DIRTY!)
+EXTRA_DIST = Receivers.cxx
+libSalomeCommunication_la_CPPFLAGS = $(COMMON_CPPFLAGS) $(OPT_CPPFLAGS)
+libSalomeCommunication_la_LDFLAGS = -no-undefined -version-info=0:0:0 $(OPT_LDFLAGS)
+libSalomeCommunication_la_LIBADD = $(COMMON_LIBS) $(OPT_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/Communication/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/Communication/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libSalomeCommunication.la: $(libSalomeCommunication_la_OBJECTS) $(libSalomeCommunication_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libSalomeCommunication_la_LDFLAGS) $(libSalomeCommunication_la_OBJECTS) $(libSalomeCommunication_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-MatrixClient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-MultiCommException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-ReceiverFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-SALOMEMultiComm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-SALOME_Comm_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-SALOME_Matrix_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCommunication_la-SenderFactory.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libSalomeCommunication_la-SALOME_Comm_i.lo: SALOME_Comm_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-SALOME_Comm_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-SALOME_Comm_i.Tpo" -c -o libSalomeCommunication_la-SALOME_Comm_i.lo `test -f 'SALOME_Comm_i.cxx' || echo '$(srcdir)/'`SALOME_Comm_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-SALOME_Comm_i.Tpo" "$(DEPDIR)/libSalomeCommunication_la-SALOME_Comm_i.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-SALOME_Comm_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Comm_i.cxx' object='libSalomeCommunication_la-SALOME_Comm_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-SALOME_Comm_i.lo `test -f 'SALOME_Comm_i.cxx' || echo '$(srcdir)/'`SALOME_Comm_i.cxx
+
+libSalomeCommunication_la-SALOME_Matrix_i.lo: SALOME_Matrix_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-SALOME_Matrix_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-SALOME_Matrix_i.Tpo" -c -o libSalomeCommunication_la-SALOME_Matrix_i.lo `test -f 'SALOME_Matrix_i.cxx' || echo '$(srcdir)/'`SALOME_Matrix_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-SALOME_Matrix_i.Tpo" "$(DEPDIR)/libSalomeCommunication_la-SALOME_Matrix_i.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-SALOME_Matrix_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Matrix_i.cxx' object='libSalomeCommunication_la-SALOME_Matrix_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-SALOME_Matrix_i.lo `test -f 'SALOME_Matrix_i.cxx' || echo '$(srcdir)/'`SALOME_Matrix_i.cxx
+
+libSalomeCommunication_la-SenderFactory.lo: SenderFactory.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-SenderFactory.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-SenderFactory.Tpo" -c -o libSalomeCommunication_la-SenderFactory.lo `test -f 'SenderFactory.cxx' || echo '$(srcdir)/'`SenderFactory.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-SenderFactory.Tpo" "$(DEPDIR)/libSalomeCommunication_la-SenderFactory.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-SenderFactory.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SenderFactory.cxx' object='libSalomeCommunication_la-SenderFactory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-SenderFactory.lo `test -f 'SenderFactory.cxx' || echo '$(srcdir)/'`SenderFactory.cxx
 
-CPPFLAGS+= $(PYTHON_INCLUDES)  $(MPI_INCLUDES) 
+libSalomeCommunication_la-MultiCommException.lo: MultiCommException.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-MultiCommException.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-MultiCommException.Tpo" -c -o libSalomeCommunication_la-MultiCommException.lo `test -f 'MultiCommException.cxx' || echo '$(srcdir)/'`MultiCommException.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-MultiCommException.Tpo" "$(DEPDIR)/libSalomeCommunication_la-MultiCommException.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-MultiCommException.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='MultiCommException.cxx' object='libSalomeCommunication_la-MultiCommException.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-MultiCommException.lo `test -f 'MultiCommException.cxx' || echo '$(srcdir)/'`MultiCommException.cxx
 
-LDFLAGS+= -lOpUtil -lSALOMELocalTrace
+libSalomeCommunication_la-SALOMEMultiComm.lo: SALOMEMultiComm.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-SALOMEMultiComm.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-SALOMEMultiComm.Tpo" -c -o libSalomeCommunication_la-SALOMEMultiComm.lo `test -f 'SALOMEMultiComm.cxx' || echo '$(srcdir)/'`SALOMEMultiComm.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-SALOMEMultiComm.Tpo" "$(DEPDIR)/libSalomeCommunication_la-SALOMEMultiComm.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-SALOMEMultiComm.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEMultiComm.cxx' object='libSalomeCommunication_la-SALOMEMultiComm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-SALOMEMultiComm.lo `test -f 'SALOMEMultiComm.cxx' || echo '$(srcdir)/'`SALOMEMultiComm.cxx
 
-LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) $(MPI_LIBS)
+libSalomeCommunication_la-ReceiverFactory.lo: ReceiverFactory.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-ReceiverFactory.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-ReceiverFactory.Tpo" -c -o libSalomeCommunication_la-ReceiverFactory.lo `test -f 'ReceiverFactory.cxx' || echo '$(srcdir)/'`ReceiverFactory.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-ReceiverFactory.Tpo" "$(DEPDIR)/libSalomeCommunication_la-ReceiverFactory.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-ReceiverFactory.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='ReceiverFactory.cxx' object='libSalomeCommunication_la-ReceiverFactory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-ReceiverFactory.lo `test -f 'ReceiverFactory.cxx' || echo '$(srcdir)/'`ReceiverFactory.cxx
 
-@CONCLUDE@
+libSalomeCommunication_la-MatrixClient.lo: MatrixClient.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCommunication_la-MatrixClient.lo -MD -MP -MF "$(DEPDIR)/libSalomeCommunication_la-MatrixClient.Tpo" -c -o libSalomeCommunication_la-MatrixClient.lo `test -f 'MatrixClient.cxx' || echo '$(srcdir)/'`MatrixClient.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCommunication_la-MatrixClient.Tpo" "$(DEPDIR)/libSalomeCommunication_la-MatrixClient.Plo"; else rm -f "$(DEPDIR)/libSalomeCommunication_la-MatrixClient.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='MatrixClient.cxx' object='libSalomeCommunication_la-MatrixClient.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCommunication_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCommunication_la-MatrixClient.lo `test -f 'MatrixClient.cxx' || echo '$(srcdir)/'`MatrixClient.cxx
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+       mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-salomeincludeHEADERS
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+       uninstall-salomeincludeHEADERS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libLTLIBRARIES clean-libtool ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am \
+       install-libLTLIBRARIES install-man \
+       install-salomeincludeHEADERS install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
+
+
+#
+# ===============================================================
+# Executables targets
+# ===============================================================
+#
+# Nothing to build
+# 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.
+.NOEXPORT:
index 0e6a5c0aba475374ba4958b1ae8ca34c84e3ba71..934019a98c84579e229ea00b2fea5458bfd14ca6 100644 (file)
@@ -95,7 +95,8 @@ Engines_Component_i::Engines_Component_i(CORBA::ORB_ptr orb,
   _Executed(false) ,
   _graphName("") ,
   _nodeName(""),
- _studyId(-1)
+  _studyId(-1),
+  _CanceledThread(false)
 {
   MESSAGE("Component constructor with instanceName "<< _instanceName);
   //SCRUTE(pd_refCount);
@@ -140,7 +141,8 @@ Engines_Component_i::Engines_Component_i(CORBA::ORB_ptr orb,
  _Executed(false) ,
  _graphName("") ,
  _nodeName(""),
- _studyId(-1)
+ _studyId(-1),
+ _CanceledThread(false)
 {
   _orb = CORBA::ORB::_duplicate(orb);
   _poa = PortableServer::POA::_duplicate(poa);
@@ -333,7 +335,7 @@ bool Engines_Component_i::Kill_impl()
 #ifndef WNT
   if ( _ThreadId > 0 && pthread_self() != _ThreadId )
     {
-      RetVal = Killer( _ThreadId , 0 ) ;
+      RetVal = Killer( _ThreadId , SIGUSR2 ) ;
       _ThreadId = (pthread_t ) -1 ;
     }
 
@@ -581,6 +583,7 @@ void Engines_Component_i::beginService(const char *serviceName)
   _ThreadCpuUsed = 0 ;
   _Executed = true ;
   _serviceName = serviceName ;
+  theEngines_Component = this ;
   if ( pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS , NULL ) )
     {
       perror("pthread_setcanceltype ") ;
@@ -632,7 +635,8 @@ void Engines_Component_i::beginService(const char *serviceName)
 
 void Engines_Component_i::endService(const char *serviceName)
 {
-  _ThreadCpuUsed = CpuUsed_impl() ;
+  if ( !_CanceledThread )
+    _ThreadCpuUsed = CpuUsed_impl() ;
   MESSAGE(pthread_self() << " Send EndService notification for " << serviceName
          << endl << " Component instance : " << _instanceName << " StartUsed "
           << _StartUsed << " _ThreadCpuUsed "<< _ThreadCpuUsed << endl <<endl);
@@ -713,7 +717,8 @@ bool Engines_Component_i::Killer( pthread_t ThreadId , int signum )
 
 void SetCpuUsed()
 {
-  theEngines_Component->SetCurCpu() ;
+  if ( theEngines_Component )
+    theEngines_Component->SetCurCpu() ;
 }
 
 //=============================================================================
@@ -766,6 +771,23 @@ long Engines_Component_i::CpuUsed()
   return cpu ;
 }
 
+void CallCancelThread()
+{
+  if ( theEngines_Component )
+    theEngines_Component->CancelThread() ;
+}
+
+//=============================================================================
+/*!
+ *  C++ method:
+ */
+//=============================================================================
+
+void Engines_Component_i::CancelThread()
+{
+  _CanceledThread = true;
+}
+
 //=============================================================================
 /*! 
  *  C++ method: Send message to event channel
index c76a41b9f02db4bcb36342131ece6b2b7339de36..c632e009d4aa3d647e59dfdee2043e6eb923419b 100644 (file)
@@ -178,20 +178,26 @@ Engines_Container_i::Engines_Container_i (CORBA::ORB_ptr orb,
 
       if (!_isSupervContainer)
        {
+#ifdef WNT
          //Py_ACQUIRE_NEW_THREAD;
-    PyEval_AcquireLock();
-    /* It should not be possible for more than one thread state
+         PyEval_AcquireLock();
+         /* It should not be possible for more than one thread state
             to be used for a thread.*/
-    PyThreadState *myTstate = PyGILState_GetThisThreadState();
-    // if no thread state defined
-    if ( !myTstate ) myTstate = PyThreadState_New(KERNEL_PYTHON::_interp);
-    PyThreadState *myoldTstate = PyThreadState_Swap(myTstate);
+         PyThreadState *myTstate = PyGILState_GetThisThreadState();
+         // if no thread state defined
+         if ( !myTstate ) 
+           myTstate = PyThreadState_New(KERNEL_PYTHON::_interp);
+         PyThreadState *myoldTstate = PyThreadState_Swap(myTstate);
+#else
+         Py_ACQUIRE_NEW_THREAD;
+#endif
+
 #ifdef WNT
          // mpv: this is temporary solution: there is a unregular crash if not
          //Sleep(2000);
          //
     // first element is the path to Registry.dll, but it's wrong
-    PyRun_SimpleString("import sys\n");
+         PyRun_SimpleString("import sys\n");
          PyRun_SimpleString("sys.path = sys.path[1:]\n");
 #endif
          PyRun_SimpleString("import SALOME_Container\n");
@@ -372,7 +378,9 @@ Engines_Container_i::load_component_Library(const char* componentName)
   
       if (ret) // import possible: Python component
        {
+         _numInstanceMutex.lock() ; // lock to be alone (stl container write)
          _library_map[aCompName] = (void *)pyCont; // any non O value OK
+         _numInstanceMutex.unlock() ;
          MESSAGE("import Python: "<<aCompName<<" OK");
          return true;
        }
@@ -539,7 +547,9 @@ void Engines_Container_i::remove_impl(Engines::Component_ptr component_i)
   ASSERT(! CORBA::is_nil(component_i));
   string instanceName = component_i->instanceName() ;
   MESSAGE("unload component " << instanceName);
+  _numInstanceMutex.lock() ; // lock to be alone (stl container write)
   _listInstances_map.erase(instanceName);
+  _numInstanceMutex.unlock() ;
   component_i->destroy() ;
   _NS->Destroy_Name(instanceName.c_str());
 }
@@ -622,7 +632,9 @@ Engines_Container_i::createFileRef(const char* origFileName)
       Engines::Container_var pCont = Engines::Container::_narrow(obj);
       fileRef_i* aFileRef = new fileRef_i(pCont, origFileName);
       theFileRef = Engines::fileRef::_narrow(aFileRef->_this());
+      _numInstanceMutex.lock() ; // lock to be alone (stl container write)
       _fileRef_map[origName] = theFileRef;
+      _numInstanceMutex.unlock() ;
     }
   
   theFileRef =  Engines::fileRef::_duplicate(_fileRef_map[origName]);
@@ -816,8 +828,10 @@ Engines_Container_i::createInstance(string genericRegisterName,
       //SCRUTE(servant->pd_refCount);
       servant->_remove_ref(); // compensate previous id_to_reference 
       //SCRUTE(servant->pd_refCount);
+      _numInstanceMutex.lock() ; // lock to be alone (stl container write)
       _listInstances_map[instanceName] = iobject;
       _cntInstances_map[aGenRegisterName] += 1;
+      _numInstanceMutex.unlock() ;
       SCRUTE(aGenRegisterName);
       SCRUTE(_cntInstances_map[aGenRegisterName]);
       //SCRUTE(servant->pd_refCount);
@@ -910,6 +924,11 @@ void ActSigIntHandler()
       perror("SALOME_Container main ") ;
       exit(0) ;
     }
+  if ( sigaction( SIGUSR2 , &SigIntAct, NULL ) )
+    {
+      perror("SALOME_Container main ") ;
+      exit(0) ;
+    }
 
   //PAL9042 JR : during the execution of a Signal Handler (and of methods called through Signal Handlers)
   //             use of streams (and so on) should never be used because :
@@ -927,6 +946,7 @@ void ActSigIntHandler()
 }
 
 void SetCpuUsed() ;
+void CallCancelThread() ;
 
 #ifndef WNT
 void SigIntHandler(int what ,
@@ -957,6 +977,10 @@ void SigIntHandler(int what ,
        {
          SetCpuUsed() ;
        }
+      else if ( siginfo->si_signo == SIGUSR2 )
+       {
+         CallCancelThread() ;
+       }
       else 
        {
          _Sleeping = true ;
@@ -1004,4 +1028,4 @@ void SigIntHandler( int what )
       return ;
     }
 }
-#endif
\ No newline at end of file
+#endif
index 90ef4a9446a1727f7a45b5a1d9979252e4875d58..7bfbbcf125f7ff87bee8dcdb149cc87835ca2cf3 100644 (file)
@@ -1,3 +1,19 @@
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
 #  SALOME Container : implementation of container and engine for Kernel
 #
 #  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
-#  File   : Makefile.in
-#  Author : Paul RASCLE, EDF
-#  Module : SALOME
+#  File   : Makefile.am
+#  Author : Guillaume Boulant (CSSI)
+#  Module : KERNEL
 #  $Header$
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+#
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
 
 
-@COMMENCE@
 
-EXPORT_PYSCRIPTS = SALOME_ComponentPy.py \
-       SALOME_ContainerPy.py \
-       SALOME_Container.py
 
-EXPORT_HEADERS = \
+
+SOURCES = $(libSalomeContainer_la_SOURCES) $(SALOME_Container_SOURCES) $(SALOME_ContainerManagerServer_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(dist_salomescript_DATA) $(dist_salomescript_SCRIPTS) \
+       $(salomeinclude_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+bin_PROGRAMS = SALOME_Container$(EXEEXT) \
+       SALOME_ContainerManagerServer$(EXEEXT)
+subdir = ./src/Container
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomescriptdir)" \
+       "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 = ../Registry/libRegistry.la \
+       ../Notification/libSalomeNotification.la \
+       ../ResourcesManager/libSalomeResourcesManager.la \
+       ../NamingService/libSalomeNS.la ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+libSalomeContainer_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libSalomeContainer_la_OBJECTS =  \
+       libSalomeContainer_la-Component_i.lo \
+       libSalomeContainer_la-Container_i.lo \
+       libSalomeContainer_la-SALOME_FileTransfer_i.lo \
+       libSalomeContainer_la-SALOME_FileRef_i.lo \
+       libSalomeContainer_la-SALOME_ContainerManager.lo \
+       libSalomeContainer_la-Container_init_python.lo
+libSalomeContainer_la_OBJECTS = $(am_libSalomeContainer_la_OBJECTS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_SALOME_Container_OBJECTS =  \
+       SALOME_Container-SALOME_Container.$(OBJEXT) \
+       SALOME_Container-SALOME_Container_SignalsHandler.$(OBJEXT)
+SALOME_Container_OBJECTS = $(am_SALOME_Container_OBJECTS)
+SALOME_Container_DEPENDENCIES = libSalomeContainer.la \
+       $(am__DEPENDENCIES_1) ../Basics/libSALOMEBasics.la
+am_SALOME_ContainerManagerServer_OBJECTS = SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.$(OBJEXT)
+SALOME_ContainerManagerServer_OBJECTS =  \
+       $(am_SALOME_ContainerManagerServer_OBJECTS)
+SALOME_ContainerManagerServer_DEPENDENCIES = libSalomeContainer.la \
+       $(am__DEPENDENCIES_1) ../Basics/libSALOMEBasics.la
+dist_salomescriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(dist_salomescript_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libSalomeContainer_la_SOURCES) $(SALOME_Container_SOURCES) \
+       $(SALOME_ContainerManagerServer_SOURCES)
+DIST_SOURCES = $(libSalomeContainer_la_SOURCES) \
+       $(SALOME_Container_SOURCES) \
+       $(SALOME_ContainerManagerServer_SOURCES)
+dist_salomescriptDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_salomescript_DATA)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
+
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
+
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+#
+# ===============================================================
+# Header to be installed
+# ===============================================================
+#
+# header files  
+salomeinclude_HEADERS = \
        SALOME_Component_i.hxx \
        SALOME_Container_i.hxx \
+       SALOME_FileTransfer_i.hxx \
+       SALOME_FileRef_i.hxx \
        SALOME_ContainerManager.hxx \
        Container_init_python.hxx \
        SALOME_Container.hxx
 
+
+# Scripts to be installed
+dist_salomescript_DATA = \
+       SALOME_ComponentPy.py \
+       SALOME_Container.py
+
+
+# These files are executable scripts
+dist_salomescript_SCRIPTS = \
+       SALOME_ContainerPy.py
+
+
+#
+# ===============================================================
+# Local definitions
+# ===============================================================
+#
+
+# This local variable defines the list of CPPFLAGS common to all target in this package.
+COMMON_CPPFLAGS = \
+       @PYTHON_INCLUDES@ \
+       @MPI_INCLUDES@ \
+       @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \
+       @QT_MT_INCLUDES@ \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../NamingService \
+       -I$(srcdir)/../Utils \
+       -I$(srcdir)/../Registry \
+       -I$(srcdir)/../Notification \
+       -I$(srcdir)/../ResourcesManager \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+
+# This local variable defines the list of dependant libraries common to all target in this package.
+COMMON_LIBS = \
+       ../Registry/libRegistry.la \
+       ../Notification/libSalomeNotification.la \
+       ../ResourcesManager/libSalomeResourcesManager.la \
+       ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la\
+       @PYTHON_LIBS@ \
+       @MPI_LIBS@ \
+       @CORBA_LIBS@
+
+
+#
+# ===============================================================
 # Libraries targets
+# ===============================================================
+#
+lib_LTLIBRARIES = libSalomeContainer.la
+libSalomeContainer_la_SOURCES = \
+       Component_i.cxx \
+       Container_i.cxx \
+       SALOME_FileTransfer_i.cxx \
+       SALOME_FileRef_i.cxx \
+       SALOME_ContainerManager.cxx \
+       Container_init_python.cxx 
+
+libSalomeContainer_la_CPPFLAGS = \
+       $(COMMON_CPPFLAGS)
+
+libSalomeContainer_la_LDFLAGS = \
+       -no-undefined -version-info=0:0:0 \
+       @LDEXPDYNFLAGS@
+
+libSalomeContainer_la_LIBADD = \
+       $(COMMON_LIBS)
+
+SALOME_Container_SOURCES = \
+       SALOME_Container.cxx \
+       SALOME_Container_SignalsHandler.cxx
+
+SALOME_Container_CPPFLAGS = \
+       $(COMMON_CPPFLAGS)
+
+SALOME_Container_LDADD = \
+       libSalomeContainer.la \
+       $(COMMON_LIBS) \
+       ../Basics/libSALOMEBasics.la
+
+SALOME_ContainerManagerServer_SOURCES = \
+       SALOME_ContainerManagerServer.cxx
+
+SALOME_ContainerManagerServer_CPPFLAGS = \
+       $(COMMON_CPPFLAGS)
+
+SALOME_ContainerManagerServer_LDADD = \
+       libSalomeContainer.la \
+       $(COMMON_LIBS) \
+       ../Basics/libSALOMEBasics.la
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/Container/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/Container/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libSalomeContainer.la: $(libSalomeContainer_la_OBJECTS) $(libSalomeContainer_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libSalomeContainer_la_LDFLAGS) $(libSalomeContainer_la_OBJECTS) $(libSalomeContainer_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
+       done
+
+clean-binPROGRAMS:
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
+SALOME_Container$(EXEEXT): $(SALOME_Container_OBJECTS) $(SALOME_Container_DEPENDENCIES) 
+       @rm -f SALOME_Container$(EXEEXT)
+       $(CXXLINK) $(SALOME_Container_LDFLAGS) $(SALOME_Container_OBJECTS) $(SALOME_Container_LDADD) $(LIBS)
+SALOME_ContainerManagerServer$(EXEEXT): $(SALOME_ContainerManagerServer_OBJECTS) $(SALOME_ContainerManagerServer_DEPENDENCIES) 
+       @rm -f SALOME_ContainerManagerServer$(EXEEXT)
+       $(CXXLINK) $(SALOME_ContainerManagerServer_LDFLAGS) $(SALOME_ContainerManagerServer_OBJECTS) $(SALOME_ContainerManagerServer_LDADD) $(LIBS)
+install-dist_salomescriptSCRIPTS: $(dist_salomescript_SCRIPTS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomescriptdir)" || $(mkdir_p) "$(DESTDIR)$(salomescriptdir)"
+       @list='$(dist_salomescript_SCRIPTS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         if test -f $$d$$p; then \
+           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+           echo " $(dist_salomescriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+           $(dist_salomescriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(salomescriptdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-dist_salomescriptSCRIPTS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(dist_salomescript_SCRIPTS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+         echo " rm -f '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_Container-SALOME_Container.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-Component_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-Container_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-Container_init_python.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-SALOME_ContainerManager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-SALOME_FileRef_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeContainer_la-SALOME_FileTransfer_i.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libSalomeContainer_la-Component_i.lo: Component_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-Component_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-Component_i.Tpo" -c -o libSalomeContainer_la-Component_i.lo `test -f 'Component_i.cxx' || echo '$(srcdir)/'`Component_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-Component_i.Tpo" "$(DEPDIR)/libSalomeContainer_la-Component_i.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-Component_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='Component_i.cxx' object='libSalomeContainer_la-Component_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-Component_i.lo `test -f 'Component_i.cxx' || echo '$(srcdir)/'`Component_i.cxx
+
+libSalomeContainer_la-Container_i.lo: Container_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-Container_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-Container_i.Tpo" -c -o libSalomeContainer_la-Container_i.lo `test -f 'Container_i.cxx' || echo '$(srcdir)/'`Container_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-Container_i.Tpo" "$(DEPDIR)/libSalomeContainer_la-Container_i.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-Container_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='Container_i.cxx' object='libSalomeContainer_la-Container_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-Container_i.lo `test -f 'Container_i.cxx' || echo '$(srcdir)/'`Container_i.cxx
+
+libSalomeContainer_la-SALOME_FileTransfer_i.lo: SALOME_FileTransfer_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-SALOME_FileTransfer_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-SALOME_FileTransfer_i.Tpo" -c -o libSalomeContainer_la-SALOME_FileTransfer_i.lo `test -f 'SALOME_FileTransfer_i.cxx' || echo '$(srcdir)/'`SALOME_FileTransfer_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-SALOME_FileTransfer_i.Tpo" "$(DEPDIR)/libSalomeContainer_la-SALOME_FileTransfer_i.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-SALOME_FileTransfer_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_FileTransfer_i.cxx' object='libSalomeContainer_la-SALOME_FileTransfer_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-SALOME_FileTransfer_i.lo `test -f 'SALOME_FileTransfer_i.cxx' || echo '$(srcdir)/'`SALOME_FileTransfer_i.cxx
+
+libSalomeContainer_la-SALOME_FileRef_i.lo: SALOME_FileRef_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-SALOME_FileRef_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-SALOME_FileRef_i.Tpo" -c -o libSalomeContainer_la-SALOME_FileRef_i.lo `test -f 'SALOME_FileRef_i.cxx' || echo '$(srcdir)/'`SALOME_FileRef_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-SALOME_FileRef_i.Tpo" "$(DEPDIR)/libSalomeContainer_la-SALOME_FileRef_i.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-SALOME_FileRef_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_FileRef_i.cxx' object='libSalomeContainer_la-SALOME_FileRef_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-SALOME_FileRef_i.lo `test -f 'SALOME_FileRef_i.cxx' || echo '$(srcdir)/'`SALOME_FileRef_i.cxx
+
+libSalomeContainer_la-SALOME_ContainerManager.lo: SALOME_ContainerManager.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-SALOME_ContainerManager.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-SALOME_ContainerManager.Tpo" -c -o libSalomeContainer_la-SALOME_ContainerManager.lo `test -f 'SALOME_ContainerManager.cxx' || echo '$(srcdir)/'`SALOME_ContainerManager.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-SALOME_ContainerManager.Tpo" "$(DEPDIR)/libSalomeContainer_la-SALOME_ContainerManager.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-SALOME_ContainerManager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ContainerManager.cxx' object='libSalomeContainer_la-SALOME_ContainerManager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-SALOME_ContainerManager.lo `test -f 'SALOME_ContainerManager.cxx' || echo '$(srcdir)/'`SALOME_ContainerManager.cxx
+
+libSalomeContainer_la-Container_init_python.lo: Container_init_python.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeContainer_la-Container_init_python.lo -MD -MP -MF "$(DEPDIR)/libSalomeContainer_la-Container_init_python.Tpo" -c -o libSalomeContainer_la-Container_init_python.lo `test -f 'Container_init_python.cxx' || echo '$(srcdir)/'`Container_init_python.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeContainer_la-Container_init_python.Tpo" "$(DEPDIR)/libSalomeContainer_la-Container_init_python.Plo"; else rm -f "$(DEPDIR)/libSalomeContainer_la-Container_init_python.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='Container_init_python.cxx' object='libSalomeContainer_la-Container_init_python.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeContainer_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeContainer_la-Container_init_python.lo `test -f 'Container_init_python.cxx' || echo '$(srcdir)/'`Container_init_python.cxx
+
+SALOME_Container-SALOME_Container.o: SALOME_Container.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Container-SALOME_Container.o -MD -MP -MF "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo" -c -o SALOME_Container-SALOME_Container.o `test -f 'SALOME_Container.cxx' || echo '$(srcdir)/'`SALOME_Container.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo" "$(DEPDIR)/SALOME_Container-SALOME_Container.Po"; else rm -f "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Container.cxx' object='SALOME_Container-SALOME_Container.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Container-SALOME_Container.o `test -f 'SALOME_Container.cxx' || echo '$(srcdir)/'`SALOME_Container.cxx
+
+SALOME_Container-SALOME_Container.obj: SALOME_Container.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Container-SALOME_Container.obj -MD -MP -MF "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo" -c -o SALOME_Container-SALOME_Container.obj `if test -f 'SALOME_Container.cxx'; then $(CYGPATH_W) 'SALOME_Container.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Container.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo" "$(DEPDIR)/SALOME_Container-SALOME_Container.Po"; else rm -f "$(DEPDIR)/SALOME_Container-SALOME_Container.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Container.cxx' object='SALOME_Container-SALOME_Container.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Container-SALOME_Container.obj `if test -f 'SALOME_Container.cxx'; then $(CYGPATH_W) 'SALOME_Container.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Container.cxx'; fi`
+
+SALOME_Container-SALOME_Container_SignalsHandler.o: SALOME_Container_SignalsHandler.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Container-SALOME_Container_SignalsHandler.o -MD -MP -MF "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo" -c -o SALOME_Container-SALOME_Container_SignalsHandler.o `test -f 'SALOME_Container_SignalsHandler.cxx' || echo '$(srcdir)/'`SALOME_Container_SignalsHandler.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo" "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Po"; else rm -f "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Container_SignalsHandler.cxx' object='SALOME_Container-SALOME_Container_SignalsHandler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Container-SALOME_Container_SignalsHandler.o `test -f 'SALOME_Container_SignalsHandler.cxx' || echo '$(srcdir)/'`SALOME_Container_SignalsHandler.cxx
+
+SALOME_Container-SALOME_Container_SignalsHandler.obj: SALOME_Container_SignalsHandler.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Container-SALOME_Container_SignalsHandler.obj -MD -MP -MF "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo" -c -o SALOME_Container-SALOME_Container_SignalsHandler.obj `if test -f 'SALOME_Container_SignalsHandler.cxx'; then $(CYGPATH_W) 'SALOME_Container_SignalsHandler.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Container_SignalsHandler.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo" "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Po"; else rm -f "$(DEPDIR)/SALOME_Container-SALOME_Container_SignalsHandler.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Container_SignalsHandler.cxx' object='SALOME_Container-SALOME_Container_SignalsHandler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Container_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Container-SALOME_Container_SignalsHandler.obj `if test -f 'SALOME_Container_SignalsHandler.cxx'; then $(CYGPATH_W) 'SALOME_Container_SignalsHandler.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Container_SignalsHandler.cxx'; fi`
+
+SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.o: SALOME_ContainerManagerServer.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ContainerManagerServer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.o -MD -MP -MF "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo" -c -o SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.o `test -f 'SALOME_ContainerManagerServer.cxx' || echo '$(srcdir)/'`SALOME_ContainerManagerServer.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo" "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Po"; else rm -f "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ContainerManagerServer.cxx' object='SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ContainerManagerServer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.o `test -f 'SALOME_ContainerManagerServer.cxx' || echo '$(srcdir)/'`SALOME_ContainerManagerServer.cxx
+
+SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.obj: SALOME_ContainerManagerServer.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ContainerManagerServer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.obj -MD -MP -MF "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo" -c -o SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.obj `if test -f 'SALOME_ContainerManagerServer.cxx'; then $(CYGPATH_W) 'SALOME_ContainerManagerServer.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ContainerManagerServer.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo" "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Po"; else rm -f "$(DEPDIR)/SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ContainerManagerServer.cxx' object='SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ContainerManagerServer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ContainerManagerServer-SALOME_ContainerManagerServer.obj `if test -f 'SALOME_ContainerManagerServer.cxx'; then $(CYGPATH_W) 'SALOME_ContainerManagerServer.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ContainerManagerServer.cxx'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-dist_salomescriptDATA: $(dist_salomescript_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomescriptdir)" || $(mkdir_p) "$(DESTDIR)$(salomescriptdir)"
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(dist_salomescriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         $(dist_salomescriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+
+uninstall-dist_salomescriptDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+               $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+       clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_salomescriptDATA \
+       install-dist_salomescriptSCRIPTS install-salomeincludeHEADERS
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
 
-LIB = libSalomeContainer.la 
-LIB_SRC = Component_i.cxx \
-         Container_i.cxx \
-         SALOME_ContainerManager.cxx \
-         Container_init_python.cxx
+pdf: pdf-am
 
-LIB_SERVER_IDL = SALOME_Registry.idl SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Exception.idl
-LIB_CLIENT_IDL = 
+pdf-am:
 
-# Executables targets
-BIN = SALOME_Container SALOME_ContainerManagerServer
-BIN_SRC = SALOME_Container_SignalsHandler.cxx
-BIN_SERVER_IDL = SALOME_Component.idl SALOME_ContainerManager.idl
+ps: ps-am
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(MPI_INCLUDES) $(OCC_INCLUDES) $(QT_MT_INCLUDES)
-CXXFLAGS+=$(OCC_CXXFLAGS)
+ps-am:
 
-LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSALOMELocalTrace -lSalomeResourcesManager
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_salomescriptDATA \
+       uninstall-dist_salomescriptSCRIPTS uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
-LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) $(MPI_LIBS)
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-binPROGRAMS \
+       install-data install-data-am install-dist_salomescriptDATA \
+       install-dist_salomescriptSCRIPTS install-exec install-exec-am \
+       install-info install-info-am install-libLTLIBRARIES \
+       install-man install-salomeincludeHEADERS install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-binPROGRAMS \
+       uninstall-dist_salomescriptDATA \
+       uninstall-dist_salomescriptSCRIPTS uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
-LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics
-LIBSFORBIN= $(LIBS)
-@CONCLUDE@
+# 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.
+.NOEXPORT:
index ff9b51bd7e7d820f42b28d514adc4e4ce47acba6..5107cb59e61be08296a5db86e36b1bd85f73c599 100644 (file)
@@ -114,6 +114,7 @@ public:
   bool Killer( pthread_t ThreadId , int signum );
   void SetCurCpu() ;
   long CpuUsed() ;
+  void CancelThread() ;
 
 protected:
   int _studyId; // -1: not initialised; 0: multiStudy; >0: study
@@ -145,6 +146,7 @@ private:
   long      _StartUsed ;
   long      _ThreadCpuUsed ;
   bool      _Executed ;
+  bool      _CanceledThread ;
 };
 
 #endif
index c19046ccb9264215f5360223d432879b7486c7c8..4de4212a2897fbb84760c5dd301bf667d79d3ab7 100755 (executable)
@@ -217,11 +217,17 @@ def FindFileInDataDir(filename):
 orb = None
 
 step = 0
-while step < 100 and orb is None:
+sleeping_time = 0.01
+sleeping_time_max = 1.0
+while 1:
     orb = CORBA.ORB_init([''], CORBA.ORB_ID)
+    if orb is not None: break
     step = step + 1
-    time.sleep(4)
-
+    if step > 100: break
+    time.sleep(sleeping_time)
+    sleeping_time = max(sleeping_time_max, 2*sleeping_time)
+    pass
+    
 if orb is None:
     print "Warning: ORB has not been initialized !!!"
 
@@ -229,10 +235,16 @@ if orb is None:
 lcc = LifeCycleCORBA(orb)
 
 step = 0
-while step < 100 and lcc is None:
+sleeping_time = 0.01
+sleeping_time_max = 1.0
+while 1:
     lcc = LifeCycleCORBA(orb)
+    if lcc is not None: break
     step = step + 1
-    time.sleep(4)
+    if step > 100: break
+    time.sleep(sleeping_time)
+    sleeping_time = max(sleeping_time_max, 2*sleeping_time)
+    pass
     
 if lcc is None:
     print "Warning: LifeCycleCORBA object has not been initialized !!!"
@@ -244,10 +256,16 @@ naming_service = SALOME_NamingServicePy_i(orb)
 obj = None
 
 step = 0
-while step < 100 and obj == None:
+sleeping_time = 0.01
+sleeping_time_max = 1.0
+while 1:
     obj = naming_service.Resolve('myStudyManager')
+    if obj is not None:break
     step = step + 1
-    time.sleep(4)
+    if step > 100: break
+    time.sleep(sleeping_time)
+    sleeping_time = max(sleeping_time_max, 2*sleeping_time)
+    pass
      
 myStudyManager = obj._narrow(SALOMEDS.StudyManager)
 
index 60908a8e5c0bb9c84ad33008194bf0ffb0b65fc1..904e3d441e08df5e8bb560df82479855b0706b41 100755 (executable)
@@ -70,39 +70,90 @@ def register_pattern(pattern):
     patterns.append(pattern)
 
 def is_shared(name):
+    """ Indicate if module name is a shared module
+        among multiple interpreters (return value=1)
+    """
     if shared_imported.has_key(name):return 1
     for pattern in patterns:
         if pattern(name) : return 1
     return 0
 
-def get_shared_imported(name):
-    return shared_imported.get(name)
+def get_shared_imported(name,fromlist):
+    """ If the module is registered in shared_imported
+        update the sys.modules dict
+        Let the real import be done by original_import
+    """
+    module= shared_imported.get(name)
+    if module is None :
+       #module name is not shared or not already imported
+       #let original_import do the job
+       return None
+
+    # module is already imported and shared. Put it in sys.modules and 
+    # let original_import finish the job
+    sys.modules[name]=module
+
+def get_real_module(mod,name):
+    """Return effective module on import
+       Standard import returns module A on import A.B
+       To get module A.B use get_real_module with name "A.B"
+    """
+    components = name.split('.')
+    for comp in components[1:]:
+        mod = getattr(mod, comp)
+    return mod
 
 def set_shared_imported(name,module):
+    """ Register a shared module
+        Name can be a dotted name : package
+    """
     shared_imported[name]=module
     #print "Module %s shared registered" % name,module
 
-def get_shared_imported_with_copy(name):
-    module_dict= shared_imported.get(name)
-    m=imp.new_module(name)
-    m.__dict__.update(module_dict)
-    return m
-def set_shared_imported_with_copy(name,module):
-    shared_imported[name]=module.__dict__.copy()
-    #print "Module %s shared registered" % name
+def ensure_fromlist(m, fromlist, recursive=0):
+    """ Return the real modules list to be imported
+    """
+    l=[]
+    for sub in fromlist:
+        if sub == "*":
+            if not recursive:
+                try:
+                    all = m.__all__
+                except AttributeError:
+                    pass
+                else:
+                    l.extend(ensure_fromlist(m, all, 1))
+        else:
+            submod=getattr(m,sub)
+            if type(submod) == type(sys):
+               l.append(("%s.%s" % (m.__name__, sub),submod))
+    return l
 
 def import_hook(name, globals=None, locals=None, fromlist=None):
+    """ Import replacement for sharing modules among multiple interpreters
+        Mostly update sys.modules before doing real import
+    """
     #print "import_hook",name,fromlist
-    module=get_shared_imported(name)
-
-    if module:
-       sys.modules[name]=module
-       return module
+    m=get_shared_imported(name,fromlist)
 
     module= original_import(name, globals, locals, fromlist)
 
-    if is_shared(name):
-       set_shared_imported(name,module)
+    if fromlist:
+       #when fromlist is specified, module is the real module
+       #fromlist is a list of possibly dotted name
+       m=module
+       for nam,mod in ensure_fromlist(m, fromlist):
+           if is_shared(nam):
+              set_shared_imported(nam,mod)
+    else: 
+       #when fromlist is not specified and name is a dotted name,
+       # module is the root package not the real module
+       #so we need to retrieve it
+       m=get_real_module(module,name)
+
+    if type(m) == type(sys) and is_shared(m.__name__):
+       set_shared_imported(m.__name__,m)
+
     return module
 
 original_reload=__builtin__.reload
index c06cba1b6d326580c2b5f7d7ad06a562b02488bd..bcf92d92b2972a8427cfef11805ba6b9d6ac4334 100755 (executable)
@@ -31,36 +31,19 @@ register_name("libSALOME_LifeCycleCORBA")
 register_pattern(lambda(x):x.endswith("_idl"))
 register_pattern(lambda(x):x.endswith("_Swig"))
 
+register_name("omniORB")
 register_name("CORBA")
-from omniORB import CORBA
+register_name("CosNaming")
+register_name("CosNaming__POA")
+register_name("omnipatch")
 
-register_name("omniORB")
 import omniORB
-
-register_name("CosNaming")
+from omniORB import CORBA
 import CosNaming
-
-register_name("omnipatch")
+import CosNaming__POA
 import omnipatch
 
-import Engines
-import SALOME
-import SALOMEDS
-import SALOME_ModuleCatalog
-
 def init_shared_modules():
    """
       This function initializes shared modules that need to be
    """
-   # EDF-CCAR:
-   # Problem with omniORB : omniORB creates a C Python module named  _omnipy
-   # this module has sub-modules : omni_func, ...
-   # _omnipy is quite a package but import with Python sub-interpreters does not seem to work
-   # To make it work we need to add those sub-modules in sys.modules
-   import sys
-   import _omnipy
-   sys.modules["_omnipy.omni_func"]=_omnipy.omni_func
-   sys.modules["_omnipy.poa_func"]=_omnipy.poa_func
-   sys.modules["_omnipy.poamanager_func"]=_omnipy.poamanager_func
-   sys.modules["_omnipy.orb_func"]=_omnipy.orb_func
-
index 1f4f8d9c48239c5c0a158b382c0226fd0ff0ff14..8de79dad5181d7306886007c7bbef4226c58c28f 100644 (file)
@@ -42,6 +42,9 @@ def openModule(mname, fname=None):
 
     if mname == "CORBA":
         mod = sys.modules["omniORB.CORBA"]
+        # Salome modification start
+        shared_imported[mname]=mod
+        # Salome modification end
 
     elif sys.modules.has_key(mname):
         mod = sys.modules[mname]
@@ -50,16 +53,21 @@ def openModule(mname, fname=None):
             pmod = _partialModules[mname]
             mod.__dict__.update(pmod.__dict__)
             del _partialModules[mname]
+        # Salome modification start
+        shared_imported[mname]=mod
+        # Salome modification end
 
     elif _partialModules.has_key(mname):
         mod = _partialModules[mname]
 
+    # Salome modification start
+    elif shared_imported.get(mname) :
+        mod = shared_imported[mname]
+    # Salome modification end
+
     else:
         mod = newModule(mname)
 
-    # Salome modification start
-    shared_imported[mname]=mod
-    # Salome modification end
 
     if not hasattr(mod, "__doc__") or mod.__doc__ is None:
         mod.__doc__ = "omniORB IDL module " + mname + "\n\n" + \
@@ -103,12 +111,20 @@ def newModule(mname):
 # Function to update a module with the partial module store in the
 # partial module map
 def updateModule(mname):
+    # Salome modification start
+    # Be sure to use the right module dictionnary
+    import sys
+    # Salome modification end
     if _partialModules.has_key(mname):
         pmod = _partialModules[mname]
         mod  = sys.modules[mname]
         mod.__dict__.update(pmod.__dict__)
         del _partialModules[mname]
 
+    # Salome modification start
+    shared_imported[mname]=sys.modules[mname]
+    # Salome modification end
+
 omniORB.updateModule=updateModule
 omniORB.newModule=newModule
 omniORB.openModule=openModule
index 5106099a9dd1996bc520290bf8c7e7fe239bcafd..5930211cbbdde622b238ef7adf17fd2f1808c5a8 100755 (executable)
@@ -22,8 +22,6 @@
 #  File   : salome_shared_modules.py
 #  Module : SALOME
 
-from SALOME_utilities import *
-
 """
 This module with help of import_hook and *_shared_modules
 filters imports when using the embedded Python interpretor.
@@ -56,14 +54,19 @@ import glob,os,sys
 import import_hook
 # shared_imported, patterns, register_name, register_pattern
 # will be shared by all Python sub interpretors
-
-shared_imported=import_hook.shared_imported
-
 from import_hook import patterns
 from import_hook import register_name
 from import_hook import register_pattern
 
 register_name("salome_shared_modules")
+register_name("omniORB")
+register_name("omnipatch")
+register_pattern(lambda(x):x.endswith("_idl"))
+register_pattern(lambda(x):x.startswith("omniORB."))
+
+from omnipatch import shared_imported
+shared_imported.update(import_hook.shared_imported)
+import_hook.shared_imported=shared_imported
 
 # Get the SALOMEPATH if set or else use KERNEL_ROOT_DIR that should be set.
 salome_path=os.environ.get("SALOMEPATH",os.getenv("KERNEL_ROOT_DIR"))
@@ -75,15 +78,15 @@ splitter = ":"
 if sys.platform == "win32":
   splitter = ";"
 path=salome_path.split(splitter)
-#print "...SALOME_PATH = "
-#print salome_path
-#print "...PATH = "
-#print path
+import platform\r
+if platform.architecture()[0] == "64bit":\r
+    libdir = "lib64"\r
+else:\r
+    libdir = "lib"
 
 for rep in path:
     # Import all *_shared_modules in rep
-    glob_path = os.path.join(rep,"lib","python"+sys.version[:3],"site-packages","salome","shared_modules","*_shared_modules.py")
-    for f in glob.glob(glob_path):
+    for f in glob.glob(os.path.join(rep,libdir,"python"+sys.version[:3],"site-packages","salome","shared_modules","*_shared_modules.py")):
         try:
            name=os.path.splitext(os.path.basename(f))[0]
            register_name(name)
@@ -100,7 +103,7 @@ for rep in path:
 # we add them to shared_imported
 #
 for name,module in sys.modules.items():
-    if import_hook.is_shared(name) and shared_imported.get(name) is None:
+    if module and import_hook.is_shared(name) and not shared_imported.has_key(name):
        #print "Module shared added to shared_imported: ",name
        shared_imported[name]=module
 
index 45119a0daeb3c82fc0cfef6e77a1589286136d78..ef4ff83dcc603d15a3b36f8ab188c2b639b956a4 100644 (file)
@@ -184,6 +184,7 @@ string SALOME_FileTransferCORBA::getLocalFile(string localFile)
              int nbWri = fwrite(buf, sizeof(CORBA::Octet), toFollow, fp);
              ASSERT(nbWri == toFollow);
            }
+         fclose(fp);
          MESSAGE("end of transfer");
          fileTransfer->close(fileId);
          _theFileRef->addRef(myMachine.c_str(), localFile.c_str());
index 722c078ee05a2ac26f3cd8d22e7656dc38ee217f..bdeddc58efab8b6ee28230dae812e721bc59ab23 100644 (file)
@@ -281,7 +281,8 @@ bool SALOME_LifeCycleCORBA::isKnownComponentClass(const char *componentName)
        Catalog->GetComponent(componentName);
       if (CORBA::is_nil (compoInfo)) 
        {
-         INFOS("Catalog Error : Component not found in the catalog");
+         INFOS("Catalog Error: Component not found in the catalog" );
+          INFOS( componentName );        
          return false;
        }
       else return true;
index 0a1b1d8b48ae0774d0892bfc01d5ab7775b476da..b6e9dbebb54acf7e2ded69827411a72f2dfaf241 100644 (file)
@@ -52,7 +52,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 BUILT_SOURCES = swig_wrap.cpp
 
-SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA
+SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../Utils
 SWIG_SOURCES  = libSALOME_LifeCycleCORBA.i
 
 pkgpython_PYTHON = libSALOME_LifeCycleCORBA.py
index 347524308b40ad0891da4b7b3a98dec08264e0f2..e979e3920b4fe1e565c53d661ed9a893efd0f4ed 100644 (file)
@@ -176,7 +176,10 @@ class LifeCycleCORBA_SWIGTest(unittest.TestCase):
         """
         containerName = "aFarAwayContainer"
         containerName += "/swTheContainer"
-        cp1=self.lcc.FindOrLoad_Component(containerName,"SalomeTestComponent")
+        try:
+            cp1=self.lcc.FindOrLoad_Component(containerName,"SalomeTestComponent")
+        except RuntimeError,ex :
+            self.assertEqual(ex.args[0],'Salome Exception : unknown host')
         pass
        
     
index c8bbe000b8b72ec650b9a975eb1e98ce5ebf1832..b017bb535e6d92487143ab50aaf2ec96c3c7c2e8 100644 (file)
 //
 
 
+// ----------------------------------------------------------------------------
+
 %module libSALOME_LifeCycleCORBA
 
+%include <std_except.i>
+
+
+// ----------------------------------------------------------------------------
+
 %{
 #include "utilities.h"
 #include "SALOME_LifeCycleCORBA.hxx"
 #include "SALOME_FileTransferCORBA.hxx"
 #include "SALOME_NamingService.hxx"
 #include "ServiceUnreachable.hxx"
+#include "Utils_SALOME_Exception.hxx"
 
   using namespace std;
 
@@ -55,6 +63,9 @@ struct omniORBpyAPI {
 %}
 
 
+// ----------------------------------------------------------------------------
+
+
 %init
 %{
   // init section
@@ -72,20 +83,8 @@ struct omniORBpyAPI {
 %}
 
 
-%exception {
-    try {
-      $action
-    }
-    catch (ServiceUnreachable) {
-      PyErr_SetString(PyExc_RuntimeError,"Naming Service Unreacheable");
-      return NULL;
-    }
-    catch (...) {
-      PyErr_SetString(PyExc_RuntimeError, "unknown exception");
-      return NULL;
-    }
-}
 
+// ----------------------------------------------------------------------------
 
 %typemap(python,out) Engines::Container_ptr, Engines::Component_ptr, Engines::fileRef_ptr
 {
@@ -95,6 +94,20 @@ struct omniORBpyAPI {
   SCRUTE($result);
 }
 
+%typemap(python,in) Engines::fileRef_ptr aFileRef
+{
+  MESSAGE("typemap in on CORBA object ptr");
+  try {
+     CORBA::Object_ptr obj = api->pyObjRefToCxxObjRef($input,1);
+     $1 = Engines::fileRef::_narrow(obj);
+     SCRUTE($1);
+  }
+  catch (...) {
+     PyErr_SetString(PyExc_RuntimeError, "not a valid CORBA object ptr");
+  }
+}
+
+
 %typemap(python,out) std::string, 
                    string
 {
@@ -206,5 +219,39 @@ struct omniORBpyAPI {
   delete $1;
 }
 
-%include "SALOME_LifeCycleCORBA.hxx"
-%include "SALOME_FileTransferCORBA.hxx"
+// ----------------------------------------------------------------------------
+
+%include <Utils_SALOME_Exception.hxx>
+
+%exception {
+    Py_BEGIN_ALLOW_THREADS
+    try {
+      $action
+    }
+    catch (ServiceUnreachable) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_RuntimeError,"Naming Service Unreacheable");
+       return NULL;
+    }
+    catch (SALOME_Exception &e) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_RuntimeError,e.what());
+       return NULL;
+    }
+    catch (SALOME::SALOME_Exception &e) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_RuntimeError,e.details.text);
+       return NULL;
+    }
+    catch (...) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_RuntimeError, "unknown exception");
+       return NULL;
+    }
+    Py_END_ALLOW_THREADS
+}
+
+
+%include <SALOME_LifeCycleCORBA.hxx>
+%include <SALOME_FileTransferCORBA.hxx>
+
index c4fc650a416185cfc19b55afa61cf6784d1ac385..a29139fd2d5715fe642a36f0821439527e14b415 100644 (file)
@@ -44,7 +44,7 @@ salomeinclude_HEADERS = \
                SALOME_ModuleCatalog.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA = SALOME_TestModuleCatalog.py
+dist_salomescript_DATA = TestModuleCatalog.py
 
 
 #
index 26914e9da1bd4c0626d31b0b5cc7e543f63ab60b..12aaa4cb1371b37b570dc69b68a9c3e89fad45ff 100644 (file)
@@ -1,3 +1,19 @@
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
 #  SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules
 #
 #  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
-#  File   : Makefile.in
-#  Author : Paul RASCLE, EDF
+#  File   : Makefile.am
+#  Author : Guillaume Boulant (CSSI)
 #  Module : SALOME
 #  $Header$
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+#
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
+
+
+
+
+SOURCES = $(libSalomeCatalog_la_SOURCES) $(SALOME_ModuleCatalog_Client_SOURCES) $(SALOME_ModuleCatalog_Server_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(dist_salomescript_DATA) $(salomeinclude_HEADERS) \
+       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+bin_PROGRAMS = SALOME_ModuleCatalog_Server$(EXEEXT) \
+       SALOME_ModuleCatalog_Client$(EXEEXT)
+subdir = ./src/ModuleCatalog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 = ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+libSalomeCatalog_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libSalomeCatalog_la_OBJECTS =  \
+       libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo \
+       libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo \
+       libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo \
+       libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo
+libSalomeCatalog_la_OBJECTS = $(am_libSalomeCatalog_la_OBJECTS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_SALOME_ModuleCatalog_Client_OBJECTS = SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.$(OBJEXT)
+SALOME_ModuleCatalog_Client_OBJECTS =  \
+       $(am_SALOME_ModuleCatalog_Client_OBJECTS)
+SALOME_ModuleCatalog_Client_DEPENDENCIES = libSalomeCatalog.la \
+       $(am__DEPENDENCIES_1)
+am_SALOME_ModuleCatalog_Server_OBJECTS = SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.$(OBJEXT)
+SALOME_ModuleCatalog_Server_OBJECTS =  \
+       $(am_SALOME_ModuleCatalog_Server_OBJECTS)
+SALOME_ModuleCatalog_Server_DEPENDENCIES = libSalomeCatalog.la \
+       $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libSalomeCatalog_la_SOURCES) \
+       $(SALOME_ModuleCatalog_Client_SOURCES) \
+       $(SALOME_ModuleCatalog_Server_SOURCES)
+DIST_SOURCES = $(libSalomeCatalog_la_SOURCES) \
+       $(SALOME_ModuleCatalog_Client_SOURCES) \
+       $(SALOME_ModuleCatalog_Server_SOURCES)
+dist_salomescriptDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_salomescript_DATA)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
 
-@COMMENCE@
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
 
-EXPORT_PYSCRIPTS = SALOME_TestModuleCatalog.py
-EXPORT_HEADERS = \
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+#
+# ===============================================================
+# Header an scripts to be installed
+# ===============================================================
+#
+# header files  
+salomeinclude_HEADERS = \
                SALOME_ModuleCatalog_impl.hxx \
                SALOME_ModuleCatalog_Acomponent_impl.hxx \
                PathPrefix.hxx \
@@ -44,30 +459,483 @@ EXPORT_HEADERS = \
                 SALOME_ModuleCatalog_Handler.hxx \
                SALOME_ModuleCatalog.hxx
 
+
+# Scripts to be installed
+dist_salomescript_DATA = TestModuleCatalog.py
+
+#
+# ===============================================================
 # Libraries targets
-LIB = libSalomeCatalog.la
-LIB_SRC = \
-                 SALOME_ModuleCatalog_Handler.cxx  \
-                 SALOME_ModuleCatalog_Parser_IO.cxx \
-                 SALOME_ModuleCatalog_impl.cxx \
-                 SALOME_ModuleCatalog_Acomponent_impl.cxx
+# ===============================================================
+#
+lib_LTLIBRARIES = libSalomeCatalog.la
+
+# This local variable defines the list of CPPFLAGS common to all target in this package.
+COMMON_CPPFLAGS = \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../NamingService \
+       -I$(srcdir)/../Utils \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
+       @QT_MT_INCLUDES@
+
+
+# This local variable defines the list of dependant libraries common to all target in this package.
+COMMON_LIBS = \
+       ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+
+libSalomeCatalog_la_SOURCES = \
+       SALOME_ModuleCatalog_Handler.cxx  \
+       SALOME_ModuleCatalog_Parser_IO.cxx \
+       SALOME_ModuleCatalog_impl.cxx \
+       SALOME_ModuleCatalog_Acomponent_impl.cxx
+
+libSalomeCatalog_la_CPPFLAGS = \
+       $(COMMON_CPPFLAGS)
+
+libSalomeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0
+libSalomeCatalog_la_LIBADD = \
+       $(COMMON_LIBS) \
+       @QT_MT_LIBS@
+
+
+# SALOME_ModuleCatalog_Server
+SALOME_ModuleCatalog_Server_SOURCES = SALOME_ModuleCatalog_Server.cxx
+SALOME_ModuleCatalog_Server_CPPFLAGS = \
+       $(COMMON_CPPFLAGS) 
+
+SALOME_ModuleCatalog_Server_LDADD = \
+       libSalomeCatalog.la \
+       $(COMMON_LIBS) \
+       @CORBA_LIBS@
+
+
+# SALOME_ModuleCatalog_Client
+SALOME_ModuleCatalog_Client_SOURCES = SALOME_ModuleCatalog_Client.cxx
+SALOME_ModuleCatalog_Client_CPPFLAGS = \
+       $(COMMON_CPPFLAGS)
+
+SALOME_ModuleCatalog_Client_LDADD = \
+       libSalomeCatalog.la \
+       $(COMMON_LIBS) \
+       @CORBA_LIBS@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/ModuleCatalog/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/ModuleCatalog/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libSalomeCatalog.la: $(libSalomeCatalog_la_OBJECTS) $(libSalomeCatalog_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libSalomeCatalog_la_LDFLAGS) $(libSalomeCatalog_la_OBJECTS) $(libSalomeCatalog_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
+       done
+
+clean-binPROGRAMS:
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
+SALOME_ModuleCatalog_Client$(EXEEXT): $(SALOME_ModuleCatalog_Client_OBJECTS) $(SALOME_ModuleCatalog_Client_DEPENDENCIES) 
+       @rm -f SALOME_ModuleCatalog_Client$(EXEEXT)
+       $(CXXLINK) $(SALOME_ModuleCatalog_Client_LDFLAGS) $(SALOME_ModuleCatalog_Client_OBJECTS) $(SALOME_ModuleCatalog_Client_LDADD) $(LIBS)
+SALOME_ModuleCatalog_Server$(EXEEXT): $(SALOME_ModuleCatalog_Server_OBJECTS) $(SALOME_ModuleCatalog_Server_DEPENDENCIES) 
+       @rm -f SALOME_ModuleCatalog_Server$(EXEEXT)
+       $(CXXLINK) $(SALOME_ModuleCatalog_Server_LDFLAGS) $(SALOME_ModuleCatalog_Server_OBJECTS) $(SALOME_ModuleCatalog_Server_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_impl.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo: SALOME_ModuleCatalog_Handler.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo -MD -MP -MF "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.Tpo" -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo `test -f 'SALOME_ModuleCatalog_Handler.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Handler.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.Tpo" "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.Plo"; else rm -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Handler.cxx' object='libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Handler.lo `test -f 'SALOME_ModuleCatalog_Handler.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Handler.cxx
+
+libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo: SALOME_ModuleCatalog_Parser_IO.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo -MD -MP -MF "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.Tpo" -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo `test -f 'SALOME_ModuleCatalog_Parser_IO.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Parser_IO.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.Tpo" "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.Plo"; else rm -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Parser_IO.cxx' object='libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Parser_IO.lo `test -f 'SALOME_ModuleCatalog_Parser_IO.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Parser_IO.cxx
+
+libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo: SALOME_ModuleCatalog_impl.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo -MD -MP -MF "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_impl.Tpo" -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo `test -f 'SALOME_ModuleCatalog_impl.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_impl.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_impl.Tpo" "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_impl.Plo"; else rm -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_impl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_impl.cxx' object='libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_impl.lo `test -f 'SALOME_ModuleCatalog_impl.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_impl.cxx
+
+libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo: SALOME_ModuleCatalog_Acomponent_impl.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo -MD -MP -MF "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.Tpo" -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo `test -f 'SALOME_ModuleCatalog_Acomponent_impl.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Acomponent_impl.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.Tpo" "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.Plo"; else rm -f "$(DEPDIR)/libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Acomponent_impl.cxx' object='libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeCatalog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeCatalog_la-SALOME_ModuleCatalog_Acomponent_impl.lo `test -f 'SALOME_ModuleCatalog_Acomponent_impl.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Acomponent_impl.cxx
+
+SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.o: SALOME_ModuleCatalog_Client.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.o -MD -MP -MF "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo" -c -o SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.o `test -f 'SALOME_ModuleCatalog_Client.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Client.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo" "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Po"; else rm -f "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Client.cxx' object='SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.o `test -f 'SALOME_ModuleCatalog_Client.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Client.cxx
+
+SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.obj: SALOME_ModuleCatalog_Client.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.obj -MD -MP -MF "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo" -c -o SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.obj `if test -f 'SALOME_ModuleCatalog_Client.cxx'; then $(CYGPATH_W) 'SALOME_ModuleCatalog_Client.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ModuleCatalog_Client.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo" "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Po"; else rm -f "$(DEPDIR)/SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Client.cxx' object='SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ModuleCatalog_Client-SALOME_ModuleCatalog_Client.obj `if test -f 'SALOME_ModuleCatalog_Client.cxx'; then $(CYGPATH_W) 'SALOME_ModuleCatalog_Client.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ModuleCatalog_Client.cxx'; fi`
+
+SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.o: SALOME_ModuleCatalog_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.o -MD -MP -MF "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo" -c -o SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.o `test -f 'SALOME_ModuleCatalog_Server.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Server.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo" "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Po"; else rm -f "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Server.cxx' object='SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.o `test -f 'SALOME_ModuleCatalog_Server.cxx' || echo '$(srcdir)/'`SALOME_ModuleCatalog_Server.cxx
+
+SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.obj: SALOME_ModuleCatalog_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.obj -MD -MP -MF "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo" -c -o SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.obj `if test -f 'SALOME_ModuleCatalog_Server.cxx'; then $(CYGPATH_W) 'SALOME_ModuleCatalog_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ModuleCatalog_Server.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo" "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Po"; else rm -f "$(DEPDIR)/SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_ModuleCatalog_Server.cxx' object='SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_ModuleCatalog_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_ModuleCatalog_Server-SALOME_ModuleCatalog_Server.obj `if test -f 'SALOME_ModuleCatalog_Server.cxx'; then $(CYGPATH_W) 'SALOME_ModuleCatalog_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_ModuleCatalog_Server.cxx'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-dist_salomescriptDATA: $(dist_salomescript_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomescriptdir)" || $(mkdir_p) "$(DESTDIR)$(salomescriptdir)"
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(dist_salomescriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         $(dist_salomescriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+
+uninstall-dist_salomescriptDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+       clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_salomescriptDATA \
+       install-salomeincludeHEADERS
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
 
-LIB_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
 
-CXXFLAGS+=-ftemplate-depth-32
+pdf: pdf-am
 
-# Executables targets
-# trouble we have client and serveur and build don't known about this with rule
-# in fact client is a test ! So it may go away BIN !
+pdf-am:
 
-BIN = SALOME_ModuleCatalog_Server SALOME_ModuleCatalog_Client
-BIN_SRC = 
-BIN_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl
+ps: ps-am
 
-CPPFLAGS+= $(QT_MT_INCLUDES) 
-LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics
+ps-am:
 
-LDFLAGSFORBIN+=  -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_salomescriptDATA \
+       uninstall-info-am uninstall-libLTLIBRARIES \
+       uninstall-salomeincludeHEADERS
 
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-binPROGRAMS \
+       install-data install-data-am install-dist_salomescriptDATA \
+       install-exec install-exec-am install-info install-info-am \
+       install-libLTLIBRARIES install-man \
+       install-salomeincludeHEADERS install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-binPROGRAMS \
+       uninstall-dist_salomescriptDATA uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
-@CONCLUDE@
+# 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.
+.NOEXPORT:
diff --git a/src/ModuleCatalog/TestModuleCatalog.py b/src/ModuleCatalog/TestModuleCatalog.py
new file mode 100755 (executable)
index 0000000..9f9245b
--- /dev/null
@@ -0,0 +1,82 @@
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 
+import batchmode_salome
+import SALOME_ModuleCatalog
+
+print
+print "======================================================================"
+print "           XML Catalog file generation from idl file"
+print "======================================================================"
+
+import os
+os.system('runIDLparser -Wbcatalog=x \
+                 ${KERNEL_ROOT_DIR}/idl/salome/SALOME_TestModuleCatalog.idl')
+
+print "======================================================================"
+print "           Get Catalog "
+print "======================================================================"
+obj = batchmode_salome.naming_service.Resolve('Kernel/ModulCatalog')
+catalog = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog)
+catalog.GetComponentList()
+
+print 
+print "======================================================================"
+print "           Import xml file "
+print "======================================================================"
+catalog.ImportXmlCatalogFile("x.xml")
+
+name = "AddComponent"
+print 
+print "======================================================================"
+print "           Dump component <", name, "> "
+print "======================================================================"
+C = catalog.GetComponent(name)
+
+print "name       : ", C._get_componentname()
+print "username   : ", C._get_componentusername()
+print "type       : ", C._get_component_type()
+print "constraint : ", C._get_constraint()
+print "icon       : ", C._get_component_icone()
+
+for iL in C.GetInterfaceList():
+    I = C.GetInterface(iL)
+    print "interface  : ", I.interfacename
+    for S in I.interfaceservicelist:
+        print "  service : ", S.ServiceName
+        print "    ", len(S.ServiceinParameter), "in params : "
+        for iP in S.ServiceinParameter:
+            print '      ' + iP.Parametername + '(' + iP.Parametertype + ')'
+            pass
+        print "    ", len(S.ServiceoutParameter), "out params : "
+        for iP in S.ServiceoutParameter:
+            print '      ' + iP.Parametername + '(' + iP.Parametertype + ')'
+            pass
+        print "    ", len(S.ServiceinDataStreamParameter), "in datastream params : "
+        for iP in S.ServiceinDataStreamParameter:
+            print '      ' + iP.Parametername + '(' + str(iP.Parametertype) + ', ' + \
+                  str(iP.Parameterdependency) + ')'
+            pass
+        print "    ", len(S.ServiceoutDataStreamParameter), "out datastream params : "
+        for iP in S.ServiceoutDataStreamParameter:
+            print '      ' + iP.Parametername + '(' + str(iP.Parametertype) + ', ' + \
+                  str(iP.Parameterdependency) + ')'
+            pass
+        pass
+    pass
+
index b34584eb0325ad60d96e11ccbdfb21ce9fb4e030..84b550746474a1f9ad629835ea371b105c192921 100644 (file)
@@ -1,3 +1,19 @@
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
 #  SALOME Notification : wrapping of Notification service services
 #
 #  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
-#  File   : Makefile.in
-#  Author : Paul RASCLE, EDF
-#  Module : SALOME
+#  File   : Makefile.am
+#  Author : Guillaume Boulant (CSSI)
+#  Module : KERNEL
 #  $Header$
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+#
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
+
+
+SOURCES = $(libSalomeNotification_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(salomeinclude_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+subdir = ./src/Notification
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" \
+       "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libSalomeNotification_la_DEPENDENCIES = ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la
+am_libSalomeNotification_la_OBJECTS =  \
+       libSalomeNotification_la-NOTIFICATION.lo \
+       libSalomeNotification_la-NOTIFICATION_Supplier.lo \
+       libSalomeNotification_la-NOTIFICATION_Consumer.lo
+libSalomeNotification_la_OBJECTS =  \
+       $(am_libSalomeNotification_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libSalomeNotification_la_SOURCES)
+DIST_SOURCES = $(libSalomeNotification_la_SOURCES)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
 
-@COMMENCE@
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
 
-EXPORT_HEADERS = NOTIFICATION.hxx          \
-                 NOTIFICATION_Supplier.hxx \
-                 NOTIFICATION_Consumer.hxx \
-                 CosNotifyShorthands.h \
-                SALOME_NOTIFICATION.hxx
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
 
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+#
+# ===============================================================
+# Header to be installed
+# ===============================================================
+#
+# header files  
+salomeinclude_HEADERS = \
+       NOTIFICATION.hxx          \
+       NOTIFICATION_Supplier.hxx \
+       NOTIFICATION_Consumer.hxx \
+       CosNotifyShorthands.h \
+       SALOME_NOTIFICATION.hxx
+
+
+#
+# ===============================================================
 # Libraries targets
+# ===============================================================
+#
+lib_LTLIBRARIES = libSalomeNotification.la
+libSalomeNotification_la_SOURCES = \
+       NOTIFICATION.cxx          \
+       NOTIFICATION_Supplier.cxx \
+       NOTIFICATION_Consumer.cxx
+
+libSalomeNotification_la_CPPFLAGS = \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../Utils \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+libSalomeNotification_la_LDFLAGS = -no-undefined -version-info=0:0:0
+libSalomeNotification_la_LIBADD = \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       @CORBA_LIBS@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/Notification/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/Notification/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libSalomeNotification.la: $(libSalomeNotification_la_OBJECTS) $(libSalomeNotification_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libSalomeNotification_la_LDFLAGS) $(libSalomeNotification_la_OBJECTS) $(libSalomeNotification_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeNotification_la-NOTIFICATION.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Consumer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Supplier.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libSalomeNotification_la-NOTIFICATION.lo: NOTIFICATION.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeNotification_la-NOTIFICATION.lo -MD -MP -MF "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION.Tpo" -c -o libSalomeNotification_la-NOTIFICATION.lo `test -f 'NOTIFICATION.cxx' || echo '$(srcdir)/'`NOTIFICATION.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION.Tpo" "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION.Plo"; else rm -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='NOTIFICATION.cxx' object='libSalomeNotification_la-NOTIFICATION.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeNotification_la-NOTIFICATION.lo `test -f 'NOTIFICATION.cxx' || echo '$(srcdir)/'`NOTIFICATION.cxx
+
+libSalomeNotification_la-NOTIFICATION_Supplier.lo: NOTIFICATION_Supplier.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeNotification_la-NOTIFICATION_Supplier.lo -MD -MP -MF "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Supplier.Tpo" -c -o libSalomeNotification_la-NOTIFICATION_Supplier.lo `test -f 'NOTIFICATION_Supplier.cxx' || echo '$(srcdir)/'`NOTIFICATION_Supplier.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Supplier.Tpo" "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Supplier.Plo"; else rm -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Supplier.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='NOTIFICATION_Supplier.cxx' object='libSalomeNotification_la-NOTIFICATION_Supplier.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeNotification_la-NOTIFICATION_Supplier.lo `test -f 'NOTIFICATION_Supplier.cxx' || echo '$(srcdir)/'`NOTIFICATION_Supplier.cxx
+
+libSalomeNotification_la-NOTIFICATION_Consumer.lo: NOTIFICATION_Consumer.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeNotification_la-NOTIFICATION_Consumer.lo -MD -MP -MF "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Consumer.Tpo" -c -o libSalomeNotification_la-NOTIFICATION_Consumer.lo `test -f 'NOTIFICATION_Consumer.cxx' || echo '$(srcdir)/'`NOTIFICATION_Consumer.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Consumer.Tpo" "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Consumer.Plo"; else rm -f "$(DEPDIR)/libSalomeNotification_la-NOTIFICATION_Consumer.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='NOTIFICATION_Consumer.cxx' object='libSalomeNotification_la-NOTIFICATION_Consumer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeNotification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeNotification_la-NOTIFICATION_Consumer.lo `test -f 'NOTIFICATION_Consumer.cxx' || echo '$(srcdir)/'`NOTIFICATION_Consumer.cxx
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+       mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-salomeincludeHEADERS
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
 
-LIB = libSalomeNotification.la
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+       uninstall-salomeincludeHEADERS
 
-LIB_SRC = NOTIFICATION.cxx          \
-          NOTIFICATION_Supplier.cxx \
-          NOTIFICATION_Consumer.cxx
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libLTLIBRARIES clean-libtool ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am \
+       install-libLTLIBRARIES install-man \
+       install-salomeincludeHEADERS install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
-LDFLAGS+= -lOpUtil -lSALOMELocalTrace
-OMNIORB_IDLCXXFLAGS+= -Wbtp
 
-@CONCLUDE@
+#LDFLAGS+= -lOpUtil -lSALOMELocalTrace
+#OMNIORB_IDLCXXFLAGS+= -Wbtp
+# 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.
+.NOEXPORT:
index 6aff7d9bf4dd4b3b068ec655c252d2052f31a8e0..6de795e2f19b1a217e4df4de73fb9db88e7e4d2f 100644 (file)
@@ -1,3 +1,19 @@
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
 #  SALOME Registry : Registry server implementation
 #
 #  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
-#  File   : Makefile.in
-#  Author : Paul RASCLE, EDF
+#  File   : Makefile.am
+#  Author : Guillaume Boulant (CSSI)
 #  Module : SALOME
 #  $Header$
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+#
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
+
+
+
+SOURCES = $(libRegistry_la_SOURCES) $(SALOME_Registry_Server_SOURCES)
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(salomeinclude_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+bin_PROGRAMS = SALOME_Registry_Server$(EXEEXT)
+subdir = ./src/Registry
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libRegistry_la_DEPENDENCIES = ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+am_libRegistry_la_OBJECTS = libRegistry_la-RegistryConnexion.lo \
+       libRegistry_la-RegistryService.lo
+libRegistry_la_OBJECTS = $(am_libRegistry_la_OBJECTS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_SALOME_Registry_Server_OBJECTS =  \
+       SALOME_Registry_Server-SALOME_Registry_Server.$(OBJEXT)
+SALOME_Registry_Server_OBJECTS = $(am_SALOME_Registry_Server_OBJECTS)
+SALOME_Registry_Server_DEPENDENCIES = libRegistry.la \
+       ../Basics/libSALOMEBasics.la
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libRegistry_la_SOURCES) $(SALOME_Registry_Server_SOURCES)
+DIST_SOURCES = $(libRegistry_la_SOURCES) \
+       $(SALOME_Registry_Server_SOURCES)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 
-@COMMENCE@
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
 
-EXPORT_PYSCRIPTS =
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
 
-EXPORT_HEADERS = \
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+# header files  
+salomeinclude_HEADERS = \
        RegistryConnexion.hxx \
        RegistryService.hxx \
        SALOME_Registry.hxx
 
-# Libraries targets
 
-LIB = libRegistry.la 
-LIB_SRC = \
+# Libraries targets
+lib_LTLIBRARIES = libRegistry.la
+libRegistry_la_SOURCES = \
        RegistryConnexion.cxx \
-       RegistryService.cxx
-LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
+       RegistryService.cxx 
+
+libRegistry_la_LDFLAGS = -no-undefined -version-info=0:0:0
+libRegistry_la_CPPFLAGS = \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../NamingService \
+       -I$(srcdir)/../Utils \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+libRegistry_la_LIBADD = \
+       ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la
+
+SALOME_Registry_Server_SOURCES = SALOME_Registry_Server.cxx
+SALOME_Registry_Server_LDADD = \
+       libRegistry.la \
+       ../Basics/libSALOMEBasics.la \
+       @CORBA_LIBS@
+
+SALOME_Registry_Server_CPPFLAGS = \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../NamingService \
+       -I$(srcdir)/../Utils \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/Registry/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/Registry/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libRegistry.la: $(libRegistry_la_OBJECTS) $(libRegistry_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libRegistry_la_LDFLAGS) $(libRegistry_la_OBJECTS) $(libRegistry_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
+       done
+
+clean-binPROGRAMS:
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
+SALOME_Registry_Server$(EXEEXT): $(SALOME_Registry_Server_OBJECTS) $(SALOME_Registry_Server_DEPENDENCIES) 
+       @rm -f SALOME_Registry_Server$(EXEEXT)
+       $(CXXLINK) $(SALOME_Registry_Server_LDFLAGS) $(SALOME_Registry_Server_OBJECTS) $(SALOME_Registry_Server_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libRegistry_la-RegistryConnexion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libRegistry_la-RegistryService.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libRegistry_la-RegistryConnexion.lo: RegistryConnexion.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libRegistry_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libRegistry_la-RegistryConnexion.lo -MD -MP -MF "$(DEPDIR)/libRegistry_la-RegistryConnexion.Tpo" -c -o libRegistry_la-RegistryConnexion.lo `test -f 'RegistryConnexion.cxx' || echo '$(srcdir)/'`RegistryConnexion.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libRegistry_la-RegistryConnexion.Tpo" "$(DEPDIR)/libRegistry_la-RegistryConnexion.Plo"; else rm -f "$(DEPDIR)/libRegistry_la-RegistryConnexion.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='RegistryConnexion.cxx' object='libRegistry_la-RegistryConnexion.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libRegistry_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libRegistry_la-RegistryConnexion.lo `test -f 'RegistryConnexion.cxx' || echo '$(srcdir)/'`RegistryConnexion.cxx
+
+libRegistry_la-RegistryService.lo: RegistryService.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libRegistry_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libRegistry_la-RegistryService.lo -MD -MP -MF "$(DEPDIR)/libRegistry_la-RegistryService.Tpo" -c -o libRegistry_la-RegistryService.lo `test -f 'RegistryService.cxx' || echo '$(srcdir)/'`RegistryService.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libRegistry_la-RegistryService.Tpo" "$(DEPDIR)/libRegistry_la-RegistryService.Plo"; else rm -f "$(DEPDIR)/libRegistry_la-RegistryService.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='RegistryService.cxx' object='libRegistry_la-RegistryService.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libRegistry_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libRegistry_la-RegistryService.lo `test -f 'RegistryService.cxx' || echo '$(srcdir)/'`RegistryService.cxx
+
+SALOME_Registry_Server-SALOME_Registry_Server.o: SALOME_Registry_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Registry_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Registry_Server-SALOME_Registry_Server.o -MD -MP -MF "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo" -c -o SALOME_Registry_Server-SALOME_Registry_Server.o `test -f 'SALOME_Registry_Server.cxx' || echo '$(srcdir)/'`SALOME_Registry_Server.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo" "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Po"; else rm -f "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Registry_Server.cxx' object='SALOME_Registry_Server-SALOME_Registry_Server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Registry_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Registry_Server-SALOME_Registry_Server.o `test -f 'SALOME_Registry_Server.cxx' || echo '$(srcdir)/'`SALOME_Registry_Server.cxx
+
+SALOME_Registry_Server-SALOME_Registry_Server.obj: SALOME_Registry_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Registry_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOME_Registry_Server-SALOME_Registry_Server.obj -MD -MP -MF "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo" -c -o SALOME_Registry_Server-SALOME_Registry_Server.obj `if test -f 'SALOME_Registry_Server.cxx'; then $(CYGPATH_W) 'SALOME_Registry_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Registry_Server.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo" "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Po"; else rm -f "$(DEPDIR)/SALOME_Registry_Server-SALOME_Registry_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOME_Registry_Server.cxx' object='SALOME_Registry_Server-SALOME_Registry_Server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOME_Registry_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOME_Registry_Server-SALOME_Registry_Server.obj `if test -f 'SALOME_Registry_Server.cxx'; then $(CYGPATH_W) 'SALOME_Registry_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOME_Registry_Server.cxx'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+       clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-salomeincludeHEADERS
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
 
-# Executables targets
-BIN = SALOME_Registry_Server
-BIN_SRC = 
-BIN_SERVER_IDL = SALOME_Registry.idl
+ps-am:
 
-LDFLAGS+= -lSalomeNS -lOpUtil -lSALOMELocalTrace
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
-LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-binPROGRAMS \
+       install-data install-data-am install-exec install-exec-am \
+       install-info install-info-am install-libLTLIBRARIES \
+       install-man install-salomeincludeHEADERS install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-binPROGRAMS \
+       uninstall-info-am uninstall-libLTLIBRARIES \
+       uninstall-salomeincludeHEADERS
 
-@CONCLUDE@
+# 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.
+.NOEXPORT:
index e08f5960af49634747e9e95a3840f99bf204f9ea..8575f1b1c25ae1b2170dd8291ba5a74867f58acd 100755 (executable)
@@ -310,6 +310,7 @@ SALOME_ResourcesCatalog_Handler::fatalError
                .arg( exception.message() )
                .arg( exception.lineNumber() )
                .arg( exception.columnNumber() );
+  INFOS("parser error: " << errorProt.latin1());
 
   return QXmlDefaultHandler::fatalError( exception );
 }
index 30881609c7b5a515516ccff276b8f82a4ce33cae..7cfb51cc05981e49ff17ae40b02663e7d544adb1 100644 (file)
@@ -66,7 +66,7 @@ SALOME_ResourcesManager(CORBA::ORB_ptr orb,
  *  - if ${APPLI} exists in environment,
  *    look for ${HOME}/*{APPLI}/CatalogResources.xml
  *  - else look for default:
- *    ${KERNEL_ROOT_DIR}/share/salome/resources/CatalogResources.xml
+ *    ${KERNEL_ROOT_DIR}/share/salome/resources/kernel/CatalogResources.xml
  *  - parse XML resource file.
  */ 
 //=============================================================================
@@ -87,7 +87,7 @@ SALOME_ResourcesManager::SALOME_ResourcesManager(CORBA::ORB_ptr orb)
   else
     {
       _path_resources = getenv("KERNEL_ROOT_DIR");
-      _path_resources += "/share/salome/resources/CatalogResources.xml";
+      _path_resources += "/share/salome/resources/kernel/CatalogResources.xml";
     }
 
   ParseXmlFile();
index c9d61a6770bb3f08027b3bdd30ba8174158a7ee2..7b74ef808c900f0930c099bffe4ee19384eb6b7c 100644 (file)
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 
+#
+#  File   : Makefile.am
+#  Author : Guillaume Boulant (CSSI)
+#  Module : KERNEL
+
 #
-#  File   : Makefile.in
-#  Author : Sergey RUIN
-#  Module : SALOME
+# ============================================================
+# This file defines the common definitions used in several
+# Makefile. This file must be included, if needed, by the file
+# Makefile.am.
+# ============================================================
+#
+
+
+
+
+SOURCES = $(libSalomeDS_la_SOURCES) $(SALOMEDS_Client_SOURCES) $(SALOMEDS_Server_SOURCES)
 
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = $(dist_salomescript_DATA) $(salomeinclude_HEADERS) \
+       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/salome_adm/unix/make_common_starter.am
+bin_PROGRAMS = SALOMEDS_Server$(EXEEXT) SALOMEDS_Client$(EXEEXT)
+subdir = ./src/SALOMEDS
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lam.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_local.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_lsf.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpi.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_openpbs.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_sockets.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/production.m4 \
+       $(top_srcdir)/salome_adm/unix/config_files/python.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomeincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = ../TOOLSDS/libTOOLSDS.la \
+       ../NamingService/libSalomeNS.la ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
+       ../SALOMEDSImpl/libSalomeDSImpl.la \
+       ../GenericObj/libSalomeGenericObj.la \
+       ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
+       $(am__DEPENDENCIES_1)
+libSalomeDS_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_libSalomeDS_la_OBJECTS = libSalomeDS_la-SALOMEDS.lo \
+       libSalomeDS_la-SALOMEDS_Driver_i.lo \
+       libSalomeDS_la-SALOMEDS_StudyManager_i.lo \
+       libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo \
+       libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo \
+       libSalomeDS_la-SALOMEDS_ChildIterator_i.lo \
+       libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo \
+       libSalomeDS_la-SALOMEDS_Study_i.lo \
+       libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo \
+       libSalomeDS_la-SALOMEDS_SObject_i.lo \
+       libSalomeDS_la-SALOMEDS_SComponent_i.lo \
+       libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeComment_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeName_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeReal_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo \
+       libSalomeDS_la-SALOMEDS_SObject.lo \
+       libSalomeDS_la-SALOMEDS_SComponent.lo \
+       libSalomeDS_la-SALOMEDS_GenericAttribute.lo \
+       libSalomeDS_la-SALOMEDS_ChildIterator.lo \
+       libSalomeDS_la-SALOMEDS_SComponentIterator.lo \
+       libSalomeDS_la-SALOMEDS_UseCaseIterator.lo \
+       libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo \
+       libSalomeDS_la-SALOMEDS_StudyBuilder.lo \
+       libSalomeDS_la-SALOMEDS_Study.lo \
+       libSalomeDS_la-SALOMEDS_StudyManager.lo \
+       libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo \
+       libSalomeDS_la-SALOMEDS_AttributeComment.lo \
+       libSalomeDS_la-SALOMEDS_AttributeDrawable.lo \
+       libSalomeDS_la-SALOMEDS_AttributeExpandable.lo \
+       libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo \
+       libSalomeDS_la-SALOMEDS_AttributeFileType.lo \
+       libSalomeDS_la-SALOMEDS_AttributeFlags.lo \
+       libSalomeDS_la-SALOMEDS_AttributeGraphic.lo \
+       libSalomeDS_la-SALOMEDS_AttributeIOR.lo \
+       libSalomeDS_la-SALOMEDS_AttributeInteger.lo \
+       libSalomeDS_la-SALOMEDS_AttributeLocalID.lo \
+       libSalomeDS_la-SALOMEDS_AttributeName.lo \
+       libSalomeDS_la-SALOMEDS_AttributeOpened.lo \
+       libSalomeDS_la-SALOMEDS_AttributePythonObject.lo \
+       libSalomeDS_la-SALOMEDS_AttributeReal.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSelectable.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo \
+       libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo \
+       libSalomeDS_la-SALOMEDS_AttributePixMap.lo \
+       libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTarget.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTextColor.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo \
+       libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo \
+       libSalomeDS_la-SALOMEDS_AttributeUserID.lo \
+       libSalomeDS_la-SALOMEDS_TMPFile_i.lo \
+       libSalomeDS_la-SALOMEDS_AttributeParameter.lo \
+       libSalomeDS_la-SALOMEDS_IParameters.lo
+libSalomeDS_la_OBJECTS = $(am_libSalomeDS_la_OBJECTS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_SALOMEDS_Client_OBJECTS =  \
+       SALOMEDS_Client-SALOMEDS_Client.$(OBJEXT)
+SALOMEDS_Client_OBJECTS = $(am_SALOMEDS_Client_OBJECTS)
+SALOMEDS_Client_DEPENDENCIES = libSalomeDS.la $(am__DEPENDENCIES_2) \
+       ../ResourcesManager/libSalomeResourcesManager.la
+am_SALOMEDS_Server_OBJECTS =  \
+       SALOMEDS_Server-SALOMEDS_Server.$(OBJEXT)
+SALOMEDS_Server_OBJECTS = $(am_SALOMEDS_Server_OBJECTS)
+SALOMEDS_Server_DEPENDENCIES = libSalomeDS.la $(am__DEPENDENCIES_2) \
+       ../ResourcesManager/libSalomeResourcesManager.la
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libSalomeDS_la_SOURCES) $(SALOMEDS_Client_SOURCES) \
+       $(SALOMEDS_Server_SOURCES)
+DIST_SOURCES = $(libSalomeDS_la_SOURCES) $(SALOMEDS_Client_SOURCES) \
+       $(SALOMEDS_Server_SOURCES)
+dist_salomescriptDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_salomescript_DATA)
+salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(salomeinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LIBS = @BOOST_LIBS@
+BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@
+CAS_CPPFLAGS = @CAS_CPPFLAGS@
+CAS_CXXFLAGS = @CAS_CXXFLAGS@
+CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@
+CAS_KERNEL = @CAS_KERNEL@
+CAS_LDFLAGS = @CAS_LDFLAGS@
+CAS_LDPATH = @CAS_LDPATH@
+CAS_MATH = @CAS_MATH@
+CAS_MODELER = @CAS_MODELER@
+CAS_OCAF = @CAS_OCAF@
+CAS_OCAFVIS = @CAS_OCAFVIS@
+CAS_STDPLUGIN = @CAS_STDPLUGIN@
+CAS_TKTopAlgo = @CAS_TKTopAlgo@
+CAS_VIEWER = @CAS_VIEWER@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
+CORBA_GEN_FALSE = @CORBA_GEN_FALSE@
+CORBA_GEN_TRUE = @CORBA_GEN_TRUE@
+CORBA_INCLUDES = @CORBA_INCLUDES@
+CORBA_LIBS = @CORBA_LIBS@
+CORBA_ROOT = @CORBA_ROOT@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
+CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@
+CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@
+CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
+CYGPATH_W = @CYGPATH_W@
+C_DEPEND_FLAG = @C_DEPEND_FLAG@
+DEFS = @DEFS@
+DEPCC = @DEPCC@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
+DEPDIR = @DEPDIR@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HAVE_SSTREAM = @HAVE_SSTREAM@
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_MT_LIBS = @HDF5_MT_LIBS@
+IDL = @IDL@
+IDLCXXFLAGS = @IDLCXXFLAGS@
+IDLPYFLAGS = @IDLPYFLAGS@
+IDL_CLN_CXX = @IDL_CLN_CXX@
+IDL_CLN_H = @IDL_CLN_H@
+IDL_CLN_OBJ = @IDL_CLN_OBJ@
+IDL_SRV_CXX = @IDL_SRV_CXX@
+IDL_SRV_H = @IDL_SRV_H@
+IDL_SRV_OBJ = @IDL_SRV_OBJ@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDEXPDYNFLAGS = @LDEXPDYNFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@
+LN_S = @LN_S@
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LDFLAGS = @LSF_LDFLAGS@
+LSF_LIBS = @LSF_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE = @MACHINE@
+MAKEINFO = @MAKEINFO@
+MOC = @MOC@
+MODULE_NAME = @MODULE_NAME@
+MPI_INCLUDES = @MPI_INCLUDES@
+MPI_IS_OK_FALSE = @MPI_IS_OK_FALSE@
+MPI_IS_OK_TRUE = @MPI_IS_OK_TRUE@
+MPI_LIBS = @MPI_LIBS@
+OBJEXT = @OBJEXT@
+OGL_INCLUDES = @OGL_INCLUDES@
+OGL_LIBS = @OGL_LIBS@
+OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@
+OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
+OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
+OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@
+OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@
+OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
+OMNIORB_LIBS = @OMNIORB_LIBS@
+OMNIORB_ROOT = @OMNIORB_ROOT@
+OPENPBS = @OPENPBS@
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR = @OPENPBS_LIBDIR@
+OPENPBS_LIBS = @OPENPBS_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+PYTHONHOME = @PYTHONHOME@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SITE = @PYTHON_SITE@
+PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@
+PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
+PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@
+PYTHON_VERSION = @PYTHON_VERSION@
+QTDIR = @QTDIR@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LIBS = @QT_LIBS@
+QT_MT_INCLUDES = @QT_MT_INCLUDES@
+QT_MT_LIBS = @QT_MT_LIBS@
+QT_ROOT = @QT_ROOT@
+QT_VERS = @QT_VERS@
+RANLIB = @RANLIB@
+RCP = @RCP@
+RM = @RM@
+ROOT_BUILDDIR = @ROOT_BUILDDIR@
+ROOT_SRCDIR = @ROOT_SRCDIR@
+RSH = @RSH@
+RST2HTML = @RST2HTML@
+RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@
+RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@
+SCP = @SCP@
+SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SOCKETFLAGS = @SOCKETFLAGS@
+SOCKETLIBS = @SOCKETLIBS@
+SSH = @SSH@
+STDLIB = @STDLIB@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+UIC = @UIC@
+VERSION = @VERSION@
+WITHMPI = @WITHMPI@
+WITHOPENPBS = @WITHOPENPBS@
+WITH_BATCH = @WITH_BATCH@
+WITH_BATCH_FALSE = @WITH_BATCH_FALSE@
+WITH_BATCH_TRUE = @WITH_BATCH_TRUE@
+WITH_LOCAL = @WITH_LOCAL@
+WITH_LOCAL_FALSE = @WITH_LOCAL_FALSE@
+WITH_LOCAL_TRUE = @WITH_LOCAL_TRUE@
+WITH_LSF = @WITH_LSF@
+WITH_LSF_FALSE = @WITH_LSF_FALSE@
+WITH_LSF_TRUE = @WITH_LSF_TRUE@
+WITH_OPENPBS_FALSE = @WITH_OPENPBS_FALSE@
+WITH_OPENPBS_TRUE = @WITH_OPENPBS_TRUE@
+XVERSION = @XVERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = $(prefix)/bin/@PACKAGE@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+cppunit_ok = @cppunit_ok@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mpi_ok = @mpi_ok@
+oldincludedir = @oldincludedir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 
+# Standard directory for installation
+salomeincludedir = $(includedir)/@PACKAGE@
+salomescriptdir = $(bindir)
 
-@COMMENCE@
+# Directory for installing idl files
+salomeidldir = $(prefix)/idl/@PACKAGE@
 
-EXPORT_PYSCRIPTS = SALOME_DriverPy.py
+# Directory for installing resource files
+salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
 
-EXPORT_HEADERS= \
+# Directories for installing admin files
+salomeadmdir = $(prefix)/salome_adm
+salomeadmuxdir = $(salomeadmdir)/unix
+salomem4dir = $(salomeadmdir)/unix/config_files
+
+# Shared modules installation directory
+sharedpkgpythondir = $(pkgpythondir)/shared_modules
+
+# Documentation directory
+docdir = $(datadir)/doc/@PACKAGE@
+
+#
+# ===============================================================
+# Files to be installed
+# ===============================================================
+#
+# header files  
+salomeinclude_HEADERS = \
        SALOMEDS_StudyManager_i.hxx \
        SALOMEDS_Driver_i.hxx \
        SALOMEDS_StudyManager.hxx \
@@ -25,118 +545,1345 @@ EXPORT_HEADERS= \
        SALOMEDS_SComponent.hxx \
        SALOMEDS_GenericAttribute_i.hxx \
        SALOMEDS_GenericAttribute.hxx \
+       SALOMEDS_IParameters.hxx \
        SALOMEDS_Defines.hxx
 
-# Libraries targets
 
-LIB = libSalomeDS.la
-LIB_SRC =      \
-                 SALOMEDS.cxx \
-                 SALOMEDS_Driver_i.cxx \
-                 SALOMEDS_StudyManager_i.cxx \
-                 SALOMEDS_UseCaseBuilder_i.cxx \
-                 SALOMEDS_UseCaseIterator_i.cxx \
-                 SALOMEDS_ChildIterator_i.cxx \
-                 SALOMEDS_SComponentIterator_i.cxx \
-                 SALOMEDS_Study_i.cxx \
-                 SALOMEDS_StudyBuilder_i.cxx \
-                 SALOMEDS_SObject_i.cxx \
-                 SALOMEDS_SComponent_i.cxx \
-                 SALOMEDS_GenericAttribute_i.cxx \
-                 SALOMEDS_AttributeComment_i.cxx \
-                 SALOMEDS_AttributeExternalFileDef_i.cxx \
-                 SALOMEDS_AttributeFileType_i.cxx \
-                 SALOMEDS_AttributeIOR_i.cxx \
-                 SALOMEDS_AttributeInteger_i.cxx \
-                 SALOMEDS_AttributeName_i.cxx \
-                 SALOMEDS_AttributePersistentRef_i.cxx \
-                 SALOMEDS_AttributeReal_i.cxx \
-                 SALOMEDS_AttributeSequenceOfReal_i.cxx \
-                 SALOMEDS_AttributeSequenceOfInteger_i.cxx \
-                 SALOMEDS_AttributeDrawable_i.cxx \
-                 SALOMEDS_AttributeSelectable_i.cxx \
-                 SALOMEDS_AttributeOpened_i.cxx \
-                 SALOMEDS_AttributeFlags_i.cxx \
-                 SALOMEDS_AttributeGraphic_i.cxx \
-                 SALOMEDS_AttributeExpandable_i.cxx \
-                 SALOMEDS_AttributeTextColor_i.cxx  \
-                 SALOMEDS_AttributeTextHighlightColor_i.cxx  \
-                 SALOMEDS_AttributePixMap_i.cxx  \
-                 SALOMEDS_AttributeTreeNode_i.cxx \
-                 SALOMEDS_AttributeLocalID_i.cxx \
-                 SALOMEDS_AttributeUserID_i.cxx \
-                 SALOMEDS_AttributeTarget_i.cxx \
-                 SALOMEDS_AttributeTableOfInteger_i.cxx \
-                 SALOMEDS_AttributeTableOfReal_i.cxx \
-                 SALOMEDS_AttributeTableOfString_i.cxx \
-                 SALOMEDS_AttributeStudyProperties_i.cxx \
-                 SALOMEDS_AttributePythonObject_i.cxx \
-                 SALOMEDS_SObject.cxx \
-                 SALOMEDS_SComponent.cxx \
-                 SALOMEDS_GenericAttribute.cxx \
-                 SALOMEDS_ChildIterator.cxx \
-                 SALOMEDS_SComponentIterator.cxx \
-                 SALOMEDS_UseCaseIterator.cxx \
-                 SALOMEDS_UseCaseBuilder.cxx \
-                 SALOMEDS_StudyBuilder.cxx \
-                 SALOMEDS_Study.cxx \
-                 SALOMEDS_StudyManager.cxx \
-                 SALOMEDS_AttributeStudyProperties.cxx \
-                 SALOMEDS_AttributeComment.cxx \
-                 SALOMEDS_AttributeDrawable.cxx \
-                 SALOMEDS_AttributeExpandable.cxx \
-                 SALOMEDS_AttributeExternalFileDef.cxx \
-                 SALOMEDS_AttributeFileType.cxx \
-                 SALOMEDS_AttributeFlags.cxx \
-                 SALOMEDS_AttributeGraphic.cxx \
-                 SALOMEDS_AttributeIOR.cxx \
-                 SALOMEDS_AttributeInteger.cxx \
-                 SALOMEDS_AttributeLocalID.cxx \
-                 SALOMEDS_AttributeName.cxx \
-                 SALOMEDS_AttributeOpened.cxx \
-                 SALOMEDS_AttributePythonObject.cxx \
-                 SALOMEDS_AttributeReal.cxx \
-                 SALOMEDS_AttributeSelectable.cxx \
-                 SALOMEDS_AttributeSequenceOfInteger.cxx \
-                 SALOMEDS_AttributePersistentRef.cxx \
-                 SALOMEDS_AttributePixMap.cxx \
-                 SALOMEDS_AttributeSequenceOfReal.cxx \
-                 SALOMEDS_AttributeTableOfInteger.cxx \
-                 SALOMEDS_AttributeTableOfReal.cxx \
-                 SALOMEDS_AttributeTableOfString.cxx \
-                 SALOMEDS_AttributeTarget.cxx \
-                 SALOMEDS_AttributeTextColor.cxx \
-                 SALOMEDS_AttributeTextHighlightColor.cxx \
-                 SALOMEDS_AttributeTreeNode.cxx \
-                 SALOMEDS_AttributeUserID.cxx
-
-
-# Executables targets
-BIN = SALOMEDS_Server SALOMEDS_Client
-BIN_SRC = 
-LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl
-BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
-BIN_CLIENT_IDL = 
-
-CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
-CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
-LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_KERNEL) -lSalomeGenericObj -lSalomeLifeCycleCORBA
-
-# _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC.
-# La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans).
-# On est donc obligé ici, pour permettre l'édition de lien avec les bibliothèques OCC, de spécifier le
-# chemin d'accès aux bibliothèques Xmu
+# Scripts to be installed
+dist_salomescript_DATA = SALOME_DriverPy.py
+
+#
+# ===============================================================
+# Local definitions
+# ===============================================================
 #
 
-# _CS_gbo_090604 Ajout Sp.cifique Calibre 3, pour l'utilisation de la version 5.12 de la biblioth.que OCC.
-# La biblioth.que OCC5.12 a .t. compil.e sur Calibre 3 avec l'extention Xmu (impossible de compiler sans).
-# On est donc oblig. ici, pour permettre l'.dition de lien avec les biblioth.ques OCC, de sp.cifier le
-# chemin d'acc.s aux biblioth.ques Xmu
+# This local variable defines the list of CPPFLAGS common to all target in this package.
+COMMON_CPPFLAGS = \
+       @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \
+       @BOOST_CPPFLAGS@ \
+       -I$(srcdir)/../HDFPersist \
+       @HDF5_INCLUDES@ \
+       -I$(srcdir)/../Basics \
+       -I$(srcdir)/../SALOMELocalTrace \
+       -I$(srcdir)/../Utils \
+       -I$(srcdir)/../SALOMEDSImpl \
+       -I$(srcdir)/../NamingService \
+       -I$(srcdir)/../GenericObj \
+       -I$(srcdir)/../SALOMEDSClient \
+       -I$(srcdir)/../LifeCycleCORBA \
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+
+# This flag is used to resolve the dependencies of OCC libraries.
+LDXMUFLAGS = -L/usr/X11R6/lib@LIB_LOCATION_SUFFIX@ -lXmu
+
+# This local variable defines the list of dependant libraries common to all target in this package.
+COMMON_LIBS = \
+       ../TOOLSDS/libTOOLSDS.la \
+       ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../Basics/libSALOMEBasics.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
+       ../SALOMEDSImpl/libSalomeDSImpl.la \
+       ../GenericObj/libSalomeGenericObj.la \
+       ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la\
+       @CAS_KERNEL@ \
+       @HDF5_LIBS@ \
+       $(LDXMUFLAGS)
+
+
+#LDFLAGS+=  -lSalomeGenericObj -lSalomeLifeCycleCORBA
+
 #
-LDXMUFLAGS= -L/usr/X11R6/lib -lXmu
-LDFLAGS+=$(LDXMUFLAGS)
-LDFLAGSFORBIN= $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics
+# ===============================================================
+# Libraries targets
+# ===============================================================
+#
+lib_LTLIBRARIES = libSalomeDS.la
+libSalomeDS_la_SOURCES = \
+       SALOMEDS.cxx \
+       SALOMEDS_Driver_i.cxx \
+       SALOMEDS_StudyManager_i.cxx \
+       SALOMEDS_UseCaseBuilder_i.cxx \
+       SALOMEDS_UseCaseIterator_i.cxx \
+       SALOMEDS_ChildIterator_i.cxx \
+       SALOMEDS_SComponentIterator_i.cxx \
+       SALOMEDS_Study_i.cxx \
+       SALOMEDS_StudyBuilder_i.cxx \
+       SALOMEDS_SObject_i.cxx \
+       SALOMEDS_SComponent_i.cxx \
+       SALOMEDS_GenericAttribute_i.cxx \
+       SALOMEDS_AttributeComment_i.cxx \
+       SALOMEDS_AttributeExternalFileDef_i.cxx \
+       SALOMEDS_AttributeFileType_i.cxx \
+       SALOMEDS_AttributeIOR_i.cxx \
+       SALOMEDS_AttributeInteger_i.cxx \
+       SALOMEDS_AttributeName_i.cxx \
+       SALOMEDS_AttributePersistentRef_i.cxx \
+       SALOMEDS_AttributeReal_i.cxx \
+       SALOMEDS_AttributeSequenceOfReal_i.cxx \
+       SALOMEDS_AttributeSequenceOfInteger_i.cxx \
+       SALOMEDS_AttributeDrawable_i.cxx \
+       SALOMEDS_AttributeSelectable_i.cxx \
+       SALOMEDS_AttributeOpened_i.cxx \
+       SALOMEDS_AttributeFlags_i.cxx \
+       SALOMEDS_AttributeGraphic_i.cxx \
+       SALOMEDS_AttributeExpandable_i.cxx \
+       SALOMEDS_AttributeTextColor_i.cxx  \
+       SALOMEDS_AttributeTextHighlightColor_i.cxx  \
+       SALOMEDS_AttributePixMap_i.cxx  \
+       SALOMEDS_AttributeTreeNode_i.cxx \
+       SALOMEDS_AttributeLocalID_i.cxx \
+       SALOMEDS_AttributeUserID_i.cxx \
+       SALOMEDS_AttributeTarget_i.cxx \
+       SALOMEDS_AttributeTableOfInteger_i.cxx \
+       SALOMEDS_AttributeTableOfReal_i.cxx \
+       SALOMEDS_AttributeTableOfString_i.cxx \
+       SALOMEDS_AttributeStudyProperties_i.cxx \
+       SALOMEDS_AttributePythonObject_i.cxx \
+       SALOMEDS_AttributeParameter_i.cxx \
+       SALOMEDS_SObject.cxx \
+       SALOMEDS_SComponent.cxx \
+       SALOMEDS_GenericAttribute.cxx \
+       SALOMEDS_ChildIterator.cxx \
+       SALOMEDS_SComponentIterator.cxx \
+       SALOMEDS_UseCaseIterator.cxx \
+       SALOMEDS_UseCaseBuilder.cxx \
+       SALOMEDS_StudyBuilder.cxx \
+       SALOMEDS_Study.cxx \
+       SALOMEDS_StudyManager.cxx \
+       SALOMEDS_AttributeStudyProperties.cxx \
+       SALOMEDS_AttributeComment.cxx \
+       SALOMEDS_AttributeDrawable.cxx \
+       SALOMEDS_AttributeExpandable.cxx \
+       SALOMEDS_AttributeExternalFileDef.cxx \
+       SALOMEDS_AttributeFileType.cxx \
+       SALOMEDS_AttributeFlags.cxx \
+       SALOMEDS_AttributeGraphic.cxx \
+       SALOMEDS_AttributeIOR.cxx \
+       SALOMEDS_AttributeInteger.cxx \
+       SALOMEDS_AttributeLocalID.cxx \
+       SALOMEDS_AttributeName.cxx \
+       SALOMEDS_AttributeOpened.cxx \
+       SALOMEDS_AttributePythonObject.cxx \
+       SALOMEDS_AttributeReal.cxx \
+       SALOMEDS_AttributeSelectable.cxx \
+       SALOMEDS_AttributeSequenceOfInteger.cxx \
+       SALOMEDS_AttributePersistentRef.cxx \
+       SALOMEDS_AttributePixMap.cxx \
+       SALOMEDS_AttributeSequenceOfReal.cxx \
+       SALOMEDS_AttributeTableOfInteger.cxx \
+       SALOMEDS_AttributeTableOfReal.cxx \
+       SALOMEDS_AttributeTableOfString.cxx \
+       SALOMEDS_AttributeTarget.cxx \
+       SALOMEDS_AttributeTextColor.cxx \
+       SALOMEDS_AttributeTextHighlightColor.cxx \
+       SALOMEDS_AttributeTreeNode.cxx \
+       SALOMEDS_AttributeUserID.cxx \
+       SALOMEDS_TMPFile_i.cxx \
+       SALOMEDS_AttributeParameter.cxx \
+       SALOMEDS_IParameters.cxx \
+       \
+       Handle_SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx \
+       Handle_SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx \
+       Handle_SALOMEDS_DrawableAttribute.hxx \
+       Handle_SALOMEDS_ExpandableAttribute.hxx \
+       Handle_SALOMEDS_ExternalFileDef.hxx \
+       Handle_SALOMEDS_FileType.hxx \
+       Handle_SALOMEDS_IORAttribute.hxx \
+       Handle_SALOMEDS_LocalIDAttribute.hxx \
+       Handle_SALOMEDS_OCAFApplication.hxx \
+       Handle_SALOMEDS_OpenedAttribute.hxx \
+       Handle_SALOMEDS_PersRefAttribute.hxx \
+       Handle_SALOMEDS_PixMapAttribute.hxx \
+       Handle_SALOMEDS_PythonObjectAttribute.hxx \
+       Handle_SALOMEDS_SelectableAttribute.hxx \
+       Handle_SALOMEDS_SequenceOfIntegerAttribute.hxx \
+       Handle_SALOMEDS_SequenceOfRealAttribute.hxx \
+       Handle_SALOMEDS_StudyPropertiesAttribute.hxx \
+       Handle_SALOMEDS_TableOfIntegerAttribute.hxx \
+       Handle_SALOMEDS_TableOfRealAttribute.hxx \
+       Handle_SALOMEDS_TableOfStringAttribute.hxx \
+       Handle_SALOMEDS_TargetAttribute.hxx \
+       Handle_SALOMEDS_TextColorAttribute.hxx \
+       Handle_SALOMEDS_TextHighlightColorAttribute.hxx \
+       SALOMEDS_AttLong_i.hxx \
+       SALOMEDS_AttReal_i.hxx \
+       SALOMEDS_AttributeComment.hxx \
+       SALOMEDS_AttributeComment_i.hxx \
+       SALOMEDS_AttributeDrawable.hxx \
+       SALOMEDS_AttributeDrawable_i.hxx \
+       SALOMEDS_AttributeExpandable.hxx \
+       SALOMEDS_AttributeExpandable_i.hxx \
+       SALOMEDS_AttributeExternalFileDef.hxx \
+       SALOMEDS_AttributeExternalFileDef_i.hxx \
+       SALOMEDS_AttributeFileType.hxx \
+       SALOMEDS_AttributeFileType_i.hxx \
+       SALOMEDS_AttributeFlags.hxx \
+       SALOMEDS_AttributeFlags_i.hxx \
+       SALOMEDS_AttributeGraphic.hxx \
+       SALOMEDS_AttributeGraphic_i.hxx \
+       SALOMEDS_AttributeInteger.hxx \
+       SALOMEDS_AttributeInteger_i.hxx \
+       SALOMEDS_AttributeIOR.hxx \
+       SALOMEDS_AttributeIOR_i.hxx \
+       SALOMEDS_AttributeLocalID.hxx \
+       SALOMEDS_AttributeLocalID_i.hxx \
+       SALOMEDS_AttributeName.hxx \
+       SALOMEDS_AttributeName_i.hxx \
+       SALOMEDS_AttributeOpened.hxx \
+       SALOMEDS_AttributeOpened_i.hxx \
+       SALOMEDS_AttributePersistentRef.hxx \
+       SALOMEDS_AttributePersistentRef_i.hxx \
+       SALOMEDS_AttributePixMap.hxx \
+       SALOMEDS_AttributePixMap_i.hxx \
+       SALOMEDS_AttributePythonObject.hxx \
+       SALOMEDS_AttributePythonObject_i.hxx \
+       SALOMEDS_AttributeReal.hxx \
+       SALOMEDS_AttributeReal_i.hxx \
+       SALOMEDS_AttributeSelectable.hxx \
+       SALOMEDS_AttributeSelectable_i.hxx \
+       SALOMEDS_AttributeSequenceOfInteger.hxx \
+       SALOMEDS_AttributeSequenceOfInteger_i.hxx \
+       SALOMEDS_AttributeSequenceOfReal.hxx \
+       SALOMEDS_AttributeSequenceOfReal_i.hxx \
+       SALOMEDS_Attributes.hxx \
+       SALOMEDS_AttributeStudyProperties.hxx \
+       SALOMEDS_AttributeStudyProperties_i.hxx \
+       SALOMEDS_AttributeTableOfInteger.hxx \
+       SALOMEDS_AttributeTableOfInteger_i.hxx \
+       SALOMEDS_AttributeTableOfReal.hxx \
+       SALOMEDS_AttributeTableOfReal_i.hxx \
+       SALOMEDS_AttributeTableOfString.hxx \
+       SALOMEDS_AttributeTableOfString_i.hxx \
+       SALOMEDS_AttributeTarget.hxx \
+       SALOMEDS_AttributeTarget_i.hxx \
+       SALOMEDS_AttributeTextColor.hxx \
+       SALOMEDS_AttributeTextColor_i.hxx \
+       SALOMEDS_AttributeTextHighlightColor.hxx \
+       SALOMEDS_AttributeTextHighlightColor_i.hxx \
+       SALOMEDS_AttributeTreeNode.hxx \
+       SALOMEDS_AttributeTreeNode_i.hxx \
+       SALOMEDS_AttributeUserID.hxx \
+       SALOMEDS_AttributeUserID_i.hxx \
+       SALOMEDS_BasicAttributeFactory.hxx \
+       SALOMEDS_BasicAttribute_i.hxx \
+       SALOMEDS_Callback_i.hxx \
+       SALOMEDS_ChildIterator.hxx \
+       SALOMEDS_ChildIterator_i.hxx \
+       SALOMEDS_ClientAttributes.hxx \
+       SALOMEDS_DataMapIteratorOfDataMapOfIntegerString.hxx \
+       SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx \
+       SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx \
+       SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx \
+       SALOMEDS_DataMapOfIntegerString.hxx \
+       SALOMEDS_DataMapStringLabel.hxx \
+       SALOMEDS_DrawableAttribute.hxx \
+       SALOMEDS_Driver_i.hxx \
+       SALOMEDS_ExpandableAttribute.hxx \
+       SALOMEDS_ExternalFileDef.hxx \
+       SALOMEDS_FileType.hxx \
+       SALOMEDS_FlagsAttribute.hxx \
+       SALOMEDS_GenericAttribute.hxx \
+       SALOMEDS_GenericAttribute_i.hxx \
+       SALOMEDS_GraphicAttribute.hxx \
+       SALOMEDS.hxx \
+       SALOMEDS_IORAttribute.hxx \
+       SALOMEDS_LocalIDAttribute.hxx \
+       SALOMEDS_OCAFApplication.hxx \
+       SALOMEDS_OpenedAttribute.hxx \
+       SALOMEDS_PersRefAttribute.hxx \
+       SALOMEDS_PixMapAttribute.hxx \
+       SALOMEDS_PythonObjectAttribute.hxx \
+       SALOMEDS_SAttribute_i.hxx \
+       SALOMEDS_SComponent.hxx \
+       SALOMEDS_SComponent_i.hxx \
+       SALOMEDS_SComponentIterator.hxx \
+       SALOMEDS_SComponentIterator_i.hxx \
+       SALOMEDS_SelectableAttribute.hxx \
+       SALOMEDS_SequenceOfIntegerAttribute.hxx \
+       SALOMEDS_SequenceOfRealAttribute.hxx \
+       SALOMEDS_SObject.hxx \
+       SALOMEDS_SObject_i.hxx \
+       SALOMEDS_StudyBuilder.hxx \
+       SALOMEDS_StudyBuilder_i.hxx \
+       SALOMEDS_Study.hxx \
+       SALOMEDS_Study_i.hxx \
+       SALOMEDS_StudyManager.hxx \
+       SALOMEDS_StudyManager_i.hxx \
+       SALOMEDS_StudyPropertiesAttribute.hxx \
+       SALOMEDS_TableOfIntegerAttribute.hxx \
+       SALOMEDS_TableOfRealAttribute.hxx \
+       SALOMEDS_TableOfStringAttribute.hxx \
+       SALOMEDS_TargetAttribute.hxx \
+       SALOMEDS_TextColorAttribute.hxx \
+       SALOMEDS_TextHighlightColorAttribute.hxx \
+       SALOMEDS_UseCaseBuilder.hxx \
+       SALOMEDS_UseCaseBuilder_i.hxx \
+       SALOMEDS_UseCaseIterator.hxx \
+       SALOMEDS_UseCaseIterator_i.hxx \
+       SALOMEDS_AttributeParameter.hxx \
+       SALOMEDS_AttributeParameter_i.hxx \
+       SALOMEDS_TMPFile_i.hxx
+
+libSalomeDS_la_CPPFLAGS = $(COMMON_CPPFLAGS)
+libSalomeDS_la_LDFLAGS = -Wl,-E -no-undefined -version-info=0:0:0 @LDEXPDYNFLAGS@
+libSalomeDS_la_LIBADD = $(COMMON_LIBS)
+SALOMEDS_Server_SOURCES = SALOMEDS_Server.cxx
+SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS)
+SALOMEDS_Server_LDADD = \
+       libSalomeDS.la $(COMMON_LIBS) \
+       ../ResourcesManager/libSalomeResourcesManager.la \
+       @CAS_OCAF@ \
+       @CORBA_LIBS@
+
+SALOMEDS_Client_SOURCES = SALOMEDS_Client.cxx
+SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS)
+SALOMEDS_Client_LDADD = \
+       libSalomeDS.la $(COMMON_LIBS) \
+       ../ResourcesManager/libSalomeResourcesManager.la \
+       -lTKLCAF -lTKMath \
+       @CORBA_LIBS@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/salome_adm/unix/make_common_starter.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ./src/SALOMEDS/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  ./src/SALOMEDS/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libSalomeDS.la: $(libSalomeDS_la_OBJECTS) $(libSalomeDS_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(libdir) $(libSalomeDS_la_LDFLAGS) $(libSalomeDS_la_OBJECTS) $(libSalomeDS_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
+       done
+
+clean-binPROGRAMS:
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
+SALOMEDS_Client$(EXEEXT): $(SALOMEDS_Client_OBJECTS) $(SALOMEDS_Client_DEPENDENCIES) 
+       @rm -f SALOMEDS_Client$(EXEEXT)
+       $(CXXLINK) $(SALOMEDS_Client_LDFLAGS) $(SALOMEDS_Client_OBJECTS) $(SALOMEDS_Client_LDADD) $(LIBS)
+SALOMEDS_Server$(EXEEXT): $(SALOMEDS_Server_OBJECTS) $(SALOMEDS_Server_DEPENDENCIES) 
+       @rm -f SALOMEDS_Server$(EXEEXT)
+       $(CXXLINK) $(SALOMEDS_Server_LDFLAGS) $(SALOMEDS_Server_OBJECTS) $(SALOMEDS_Server_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_Driver_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_IParameters.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_TMPFile_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator_i.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libSalomeDS_la-SALOMEDS.lo: SALOMEDS.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS.Tpo" -c -o libSalomeDS_la-SALOMEDS.lo `test -f 'SALOMEDS.cxx' || echo '$(srcdir)/'`SALOMEDS.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS.cxx' object='libSalomeDS_la-SALOMEDS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS.lo `test -f 'SALOMEDS.cxx' || echo '$(srcdir)/'`SALOMEDS.cxx
+
+libSalomeDS_la-SALOMEDS_Driver_i.lo: SALOMEDS_Driver_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_Driver_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Driver_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_Driver_i.lo `test -f 'SALOMEDS_Driver_i.cxx' || echo '$(srcdir)/'`SALOMEDS_Driver_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Driver_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Driver_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Driver_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Driver_i.cxx' object='libSalomeDS_la-SALOMEDS_Driver_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_Driver_i.lo `test -f 'SALOMEDS_Driver_i.cxx' || echo '$(srcdir)/'`SALOMEDS_Driver_i.cxx
+
+libSalomeDS_la-SALOMEDS_StudyManager_i.lo: SALOMEDS_StudyManager_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_StudyManager_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_StudyManager_i.lo `test -f 'SALOMEDS_StudyManager_i.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyManager_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_StudyManager_i.cxx' object='libSalomeDS_la-SALOMEDS_StudyManager_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_StudyManager_i.lo `test -f 'SALOMEDS_StudyManager_i.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyManager_i.cxx
+
+libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo: SALOMEDS_UseCaseBuilder_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo `test -f 'SALOMEDS_UseCaseBuilder_i.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseBuilder_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_UseCaseBuilder_i.cxx' object='libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_UseCaseBuilder_i.lo `test -f 'SALOMEDS_UseCaseBuilder_i.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseBuilder_i.cxx
+
+libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo: SALOMEDS_UseCaseIterator_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo `test -f 'SALOMEDS_UseCaseIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseIterator_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_UseCaseIterator_i.cxx' object='libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_UseCaseIterator_i.lo `test -f 'SALOMEDS_UseCaseIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseIterator_i.cxx
+
+libSalomeDS_la-SALOMEDS_ChildIterator_i.lo: SALOMEDS_ChildIterator_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_ChildIterator_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_ChildIterator_i.lo `test -f 'SALOMEDS_ChildIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_ChildIterator_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_ChildIterator_i.cxx' object='libSalomeDS_la-SALOMEDS_ChildIterator_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_ChildIterator_i.lo `test -f 'SALOMEDS_ChildIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_ChildIterator_i.cxx
+
+libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo: SALOMEDS_SComponentIterator_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo `test -f 'SALOMEDS_SComponentIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponentIterator_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SComponentIterator_i.cxx' object='libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SComponentIterator_i.lo `test -f 'SALOMEDS_SComponentIterator_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponentIterator_i.cxx
+
+libSalomeDS_la-SALOMEDS_Study_i.lo: SALOMEDS_Study_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_Study_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_Study_i.lo `test -f 'SALOMEDS_Study_i.cxx' || echo '$(srcdir)/'`SALOMEDS_Study_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Study_i.cxx' object='libSalomeDS_la-SALOMEDS_Study_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_Study_i.lo `test -f 'SALOMEDS_Study_i.cxx' || echo '$(srcdir)/'`SALOMEDS_Study_i.cxx
+
+libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo: SALOMEDS_StudyBuilder_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo `test -f 'SALOMEDS_StudyBuilder_i.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyBuilder_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_StudyBuilder_i.cxx' object='libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_StudyBuilder_i.lo `test -f 'SALOMEDS_StudyBuilder_i.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyBuilder_i.cxx
+
+libSalomeDS_la-SALOMEDS_SObject_i.lo: SALOMEDS_SObject_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SObject_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_SObject_i.lo `test -f 'SALOMEDS_SObject_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SObject_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SObject_i.cxx' object='libSalomeDS_la-SALOMEDS_SObject_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SObject_i.lo `test -f 'SALOMEDS_SObject_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SObject_i.cxx
+
+libSalomeDS_la-SALOMEDS_SComponent_i.lo: SALOMEDS_SComponent_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SComponent_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_SComponent_i.lo `test -f 'SALOMEDS_SComponent_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponent_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SComponent_i.cxx' object='libSalomeDS_la-SALOMEDS_SComponent_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SComponent_i.lo `test -f 'SALOMEDS_SComponent_i.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponent_i.cxx
+
+libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo: SALOMEDS_GenericAttribute_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo `test -f 'SALOMEDS_GenericAttribute_i.cxx' || echo '$(srcdir)/'`SALOMEDS_GenericAttribute_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_GenericAttribute_i.cxx' object='libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_GenericAttribute_i.lo `test -f 'SALOMEDS_GenericAttribute_i.cxx' || echo '$(srcdir)/'`SALOMEDS_GenericAttribute_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeComment_i.lo: SALOMEDS_AttributeComment_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeComment_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeComment_i.lo `test -f 'SALOMEDS_AttributeComment_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeComment_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeComment_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeComment_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeComment_i.lo `test -f 'SALOMEDS_AttributeComment_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeComment_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo: SALOMEDS_AttributeExternalFileDef_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo `test -f 'SALOMEDS_AttributeExternalFileDef_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExternalFileDef_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeExternalFileDef_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeExternalFileDef_i.lo `test -f 'SALOMEDS_AttributeExternalFileDef_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExternalFileDef_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo: SALOMEDS_AttributeFileType_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo `test -f 'SALOMEDS_AttributeFileType_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFileType_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeFileType_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeFileType_i.lo `test -f 'SALOMEDS_AttributeFileType_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFileType_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo: SALOMEDS_AttributeIOR_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo `test -f 'SALOMEDS_AttributeIOR_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeIOR_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeIOR_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeIOR_i.lo `test -f 'SALOMEDS_AttributeIOR_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeIOR_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo: SALOMEDS_AttributeInteger_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo `test -f 'SALOMEDS_AttributeInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeInteger_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeInteger_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeInteger_i.lo `test -f 'SALOMEDS_AttributeInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeInteger_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeName_i.lo: SALOMEDS_AttributeName_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeName_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeName_i.lo `test -f 'SALOMEDS_AttributeName_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeName_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeName_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeName_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeName_i.lo `test -f 'SALOMEDS_AttributeName_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeName_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo: SALOMEDS_AttributePersistentRef_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo `test -f 'SALOMEDS_AttributePersistentRef_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePersistentRef_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePersistentRef_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePersistentRef_i.lo `test -f 'SALOMEDS_AttributePersistentRef_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePersistentRef_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeReal_i.lo: SALOMEDS_AttributeReal_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeReal_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeReal_i.lo `test -f 'SALOMEDS_AttributeReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeReal_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeReal_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeReal_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeReal_i.lo `test -f 'SALOMEDS_AttributeReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeReal_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo: SALOMEDS_AttributeSequenceOfReal_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo `test -f 'SALOMEDS_AttributeSequenceOfReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfReal_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSequenceOfReal_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal_i.lo `test -f 'SALOMEDS_AttributeSequenceOfReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfReal_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo: SALOMEDS_AttributeSequenceOfInteger_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo `test -f 'SALOMEDS_AttributeSequenceOfInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfInteger_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSequenceOfInteger_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger_i.lo `test -f 'SALOMEDS_AttributeSequenceOfInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfInteger_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo: SALOMEDS_AttributeDrawable_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo `test -f 'SALOMEDS_AttributeDrawable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeDrawable_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeDrawable_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeDrawable_i.lo `test -f 'SALOMEDS_AttributeDrawable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeDrawable_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo: SALOMEDS_AttributeSelectable_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo `test -f 'SALOMEDS_AttributeSelectable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSelectable_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSelectable_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSelectable_i.lo `test -f 'SALOMEDS_AttributeSelectable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSelectable_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo: SALOMEDS_AttributeOpened_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo `test -f 'SALOMEDS_AttributeOpened_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeOpened_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeOpened_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeOpened_i.lo `test -f 'SALOMEDS_AttributeOpened_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeOpened_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo: SALOMEDS_AttributeFlags_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo `test -f 'SALOMEDS_AttributeFlags_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFlags_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeFlags_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeFlags_i.lo `test -f 'SALOMEDS_AttributeFlags_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFlags_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo: SALOMEDS_AttributeGraphic_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo `test -f 'SALOMEDS_AttributeGraphic_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeGraphic_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeGraphic_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeGraphic_i.lo `test -f 'SALOMEDS_AttributeGraphic_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeGraphic_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo: SALOMEDS_AttributeExpandable_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo `test -f 'SALOMEDS_AttributeExpandable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExpandable_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeExpandable_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeExpandable_i.lo `test -f 'SALOMEDS_AttributeExpandable_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExpandable_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo: SALOMEDS_AttributeTextColor_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo `test -f 'SALOMEDS_AttributeTextColor_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextColor_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTextColor_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTextColor_i.lo `test -f 'SALOMEDS_AttributeTextColor_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextColor_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo: SALOMEDS_AttributeTextHighlightColor_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo `test -f 'SALOMEDS_AttributeTextHighlightColor_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextHighlightColor_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTextHighlightColor_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor_i.lo `test -f 'SALOMEDS_AttributeTextHighlightColor_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextHighlightColor_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo: SALOMEDS_AttributePixMap_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo `test -f 'SALOMEDS_AttributePixMap_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePixMap_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePixMap_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePixMap_i.lo `test -f 'SALOMEDS_AttributePixMap_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePixMap_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo: SALOMEDS_AttributeTreeNode_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo `test -f 'SALOMEDS_AttributeTreeNode_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTreeNode_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTreeNode_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTreeNode_i.lo `test -f 'SALOMEDS_AttributeTreeNode_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTreeNode_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo: SALOMEDS_AttributeLocalID_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo `test -f 'SALOMEDS_AttributeLocalID_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeLocalID_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeLocalID_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeLocalID_i.lo `test -f 'SALOMEDS_AttributeLocalID_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeLocalID_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo: SALOMEDS_AttributeUserID_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo `test -f 'SALOMEDS_AttributeUserID_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeUserID_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeUserID_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeUserID_i.lo `test -f 'SALOMEDS_AttributeUserID_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeUserID_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo: SALOMEDS_AttributeTarget_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo `test -f 'SALOMEDS_AttributeTarget_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTarget_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTarget_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTarget_i.lo `test -f 'SALOMEDS_AttributeTarget_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTarget_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo: SALOMEDS_AttributeTableOfInteger_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo `test -f 'SALOMEDS_AttributeTableOfInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfInteger_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfInteger_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfInteger_i.lo `test -f 'SALOMEDS_AttributeTableOfInteger_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfInteger_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo: SALOMEDS_AttributeTableOfReal_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo `test -f 'SALOMEDS_AttributeTableOfReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfReal_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfReal_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfReal_i.lo `test -f 'SALOMEDS_AttributeTableOfReal_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfReal_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo: SALOMEDS_AttributeTableOfString_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo `test -f 'SALOMEDS_AttributeTableOfString_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfString_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfString_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfString_i.lo `test -f 'SALOMEDS_AttributeTableOfString_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfString_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo: SALOMEDS_AttributeStudyProperties_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo `test -f 'SALOMEDS_AttributeStudyProperties_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeStudyProperties_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeStudyProperties_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeStudyProperties_i.lo `test -f 'SALOMEDS_AttributeStudyProperties_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeStudyProperties_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo: SALOMEDS_AttributePythonObject_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo `test -f 'SALOMEDS_AttributePythonObject_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePythonObject_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePythonObject_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePythonObject_i.lo `test -f 'SALOMEDS_AttributePythonObject_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePythonObject_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo: SALOMEDS_AttributeParameter_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo `test -f 'SALOMEDS_AttributeParameter_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeParameter_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeParameter_i.cxx' object='libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeParameter_i.lo `test -f 'SALOMEDS_AttributeParameter_i.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeParameter_i.cxx
+
+libSalomeDS_la-SALOMEDS_SObject.lo: SALOMEDS_SObject.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SObject.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject.Tpo" -c -o libSalomeDS_la-SALOMEDS_SObject.lo `test -f 'SALOMEDS_SObject.cxx' || echo '$(srcdir)/'`SALOMEDS_SObject.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SObject.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SObject.cxx' object='libSalomeDS_la-SALOMEDS_SObject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SObject.lo `test -f 'SALOMEDS_SObject.cxx' || echo '$(srcdir)/'`SALOMEDS_SObject.cxx
+
+libSalomeDS_la-SALOMEDS_SComponent.lo: SALOMEDS_SComponent.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SComponent.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent.Tpo" -c -o libSalomeDS_la-SALOMEDS_SComponent.lo `test -f 'SALOMEDS_SComponent.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponent.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponent.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SComponent.cxx' object='libSalomeDS_la-SALOMEDS_SComponent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SComponent.lo `test -f 'SALOMEDS_SComponent.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponent.cxx
+
+libSalomeDS_la-SALOMEDS_GenericAttribute.lo: SALOMEDS_GenericAttribute.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_GenericAttribute.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute.Tpo" -c -o libSalomeDS_la-SALOMEDS_GenericAttribute.lo `test -f 'SALOMEDS_GenericAttribute.cxx' || echo '$(srcdir)/'`SALOMEDS_GenericAttribute.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_GenericAttribute.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_GenericAttribute.cxx' object='libSalomeDS_la-SALOMEDS_GenericAttribute.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_GenericAttribute.lo `test -f 'SALOMEDS_GenericAttribute.cxx' || echo '$(srcdir)/'`SALOMEDS_GenericAttribute.cxx
+
+libSalomeDS_la-SALOMEDS_ChildIterator.lo: SALOMEDS_ChildIterator.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_ChildIterator.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator.Tpo" -c -o libSalomeDS_la-SALOMEDS_ChildIterator.lo `test -f 'SALOMEDS_ChildIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_ChildIterator.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_ChildIterator.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_ChildIterator.cxx' object='libSalomeDS_la-SALOMEDS_ChildIterator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_ChildIterator.lo `test -f 'SALOMEDS_ChildIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_ChildIterator.cxx
+
+libSalomeDS_la-SALOMEDS_SComponentIterator.lo: SALOMEDS_SComponentIterator.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_SComponentIterator.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator.Tpo" -c -o libSalomeDS_la-SALOMEDS_SComponentIterator.lo `test -f 'SALOMEDS_SComponentIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponentIterator.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_SComponentIterator.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_SComponentIterator.cxx' object='libSalomeDS_la-SALOMEDS_SComponentIterator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_SComponentIterator.lo `test -f 'SALOMEDS_SComponentIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_SComponentIterator.cxx
+
+libSalomeDS_la-SALOMEDS_UseCaseIterator.lo: SALOMEDS_UseCaseIterator.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_UseCaseIterator.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator.Tpo" -c -o libSalomeDS_la-SALOMEDS_UseCaseIterator.lo `test -f 'SALOMEDS_UseCaseIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseIterator.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseIterator.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_UseCaseIterator.cxx' object='libSalomeDS_la-SALOMEDS_UseCaseIterator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_UseCaseIterator.lo `test -f 'SALOMEDS_UseCaseIterator.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseIterator.cxx
+
+libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo: SALOMEDS_UseCaseBuilder.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder.Tpo" -c -o libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo `test -f 'SALOMEDS_UseCaseBuilder.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseBuilder.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_UseCaseBuilder.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_UseCaseBuilder.cxx' object='libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_UseCaseBuilder.lo `test -f 'SALOMEDS_UseCaseBuilder.cxx' || echo '$(srcdir)/'`SALOMEDS_UseCaseBuilder.cxx
+
+libSalomeDS_la-SALOMEDS_StudyBuilder.lo: SALOMEDS_StudyBuilder.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_StudyBuilder.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder.Tpo" -c -o libSalomeDS_la-SALOMEDS_StudyBuilder.lo `test -f 'SALOMEDS_StudyBuilder.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyBuilder.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyBuilder.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_StudyBuilder.cxx' object='libSalomeDS_la-SALOMEDS_StudyBuilder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_StudyBuilder.lo `test -f 'SALOMEDS_StudyBuilder.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyBuilder.cxx
+
+libSalomeDS_la-SALOMEDS_Study.lo: SALOMEDS_Study.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_Study.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study.Tpo" -c -o libSalomeDS_la-SALOMEDS_Study.lo `test -f 'SALOMEDS_Study.cxx' || echo '$(srcdir)/'`SALOMEDS_Study.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_Study.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Study.cxx' object='libSalomeDS_la-SALOMEDS_Study.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_Study.lo `test -f 'SALOMEDS_Study.cxx' || echo '$(srcdir)/'`SALOMEDS_Study.cxx
+
+libSalomeDS_la-SALOMEDS_StudyManager.lo: SALOMEDS_StudyManager.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_StudyManager.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager.Tpo" -c -o libSalomeDS_la-SALOMEDS_StudyManager.lo `test -f 'SALOMEDS_StudyManager.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyManager.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_StudyManager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_StudyManager.cxx' object='libSalomeDS_la-SALOMEDS_StudyManager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_StudyManager.lo `test -f 'SALOMEDS_StudyManager.cxx' || echo '$(srcdir)/'`SALOMEDS_StudyManager.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo: SALOMEDS_AttributeStudyProperties.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo `test -f 'SALOMEDS_AttributeStudyProperties.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeStudyProperties.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeStudyProperties.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeStudyProperties.cxx' object='libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeStudyProperties.lo `test -f 'SALOMEDS_AttributeStudyProperties.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeStudyProperties.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeComment.lo: SALOMEDS_AttributeComment.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeComment.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeComment.lo `test -f 'SALOMEDS_AttributeComment.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeComment.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeComment.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeComment.cxx' object='libSalomeDS_la-SALOMEDS_AttributeComment.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeComment.lo `test -f 'SALOMEDS_AttributeComment.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeComment.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeDrawable.lo: SALOMEDS_AttributeDrawable.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeDrawable.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeDrawable.lo `test -f 'SALOMEDS_AttributeDrawable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeDrawable.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeDrawable.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeDrawable.cxx' object='libSalomeDS_la-SALOMEDS_AttributeDrawable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeDrawable.lo `test -f 'SALOMEDS_AttributeDrawable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeDrawable.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeExpandable.lo: SALOMEDS_AttributeExpandable.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeExpandable.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeExpandable.lo `test -f 'SALOMEDS_AttributeExpandable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExpandable.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExpandable.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeExpandable.cxx' object='libSalomeDS_la-SALOMEDS_AttributeExpandable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeExpandable.lo `test -f 'SALOMEDS_AttributeExpandable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExpandable.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo: SALOMEDS_AttributeExternalFileDef.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo `test -f 'SALOMEDS_AttributeExternalFileDef.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExternalFileDef.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeExternalFileDef.cxx' object='libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeExternalFileDef.lo `test -f 'SALOMEDS_AttributeExternalFileDef.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeExternalFileDef.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeFileType.lo: SALOMEDS_AttributeFileType.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeFileType.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeFileType.lo `test -f 'SALOMEDS_AttributeFileType.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFileType.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFileType.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeFileType.cxx' object='libSalomeDS_la-SALOMEDS_AttributeFileType.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeFileType.lo `test -f 'SALOMEDS_AttributeFileType.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFileType.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeFlags.lo: SALOMEDS_AttributeFlags.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeFlags.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeFlags.lo `test -f 'SALOMEDS_AttributeFlags.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFlags.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeFlags.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeFlags.cxx' object='libSalomeDS_la-SALOMEDS_AttributeFlags.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeFlags.lo `test -f 'SALOMEDS_AttributeFlags.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeFlags.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeGraphic.lo: SALOMEDS_AttributeGraphic.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeGraphic.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeGraphic.lo `test -f 'SALOMEDS_AttributeGraphic.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeGraphic.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeGraphic.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeGraphic.cxx' object='libSalomeDS_la-SALOMEDS_AttributeGraphic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeGraphic.lo `test -f 'SALOMEDS_AttributeGraphic.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeGraphic.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeIOR.lo: SALOMEDS_AttributeIOR.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeIOR.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeIOR.lo `test -f 'SALOMEDS_AttributeIOR.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeIOR.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeIOR.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeIOR.cxx' object='libSalomeDS_la-SALOMEDS_AttributeIOR.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeIOR.lo `test -f 'SALOMEDS_AttributeIOR.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeIOR.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeInteger.lo: SALOMEDS_AttributeInteger.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeInteger.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeInteger.lo `test -f 'SALOMEDS_AttributeInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeInteger.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeInteger.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeInteger.cxx' object='libSalomeDS_la-SALOMEDS_AttributeInteger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeInteger.lo `test -f 'SALOMEDS_AttributeInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeInteger.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeLocalID.lo: SALOMEDS_AttributeLocalID.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeLocalID.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeLocalID.lo `test -f 'SALOMEDS_AttributeLocalID.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeLocalID.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeLocalID.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeLocalID.cxx' object='libSalomeDS_la-SALOMEDS_AttributeLocalID.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeLocalID.lo `test -f 'SALOMEDS_AttributeLocalID.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeLocalID.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeName.lo: SALOMEDS_AttributeName.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeName.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeName.lo `test -f 'SALOMEDS_AttributeName.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeName.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeName.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeName.cxx' object='libSalomeDS_la-SALOMEDS_AttributeName.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeName.lo `test -f 'SALOMEDS_AttributeName.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeName.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeOpened.lo: SALOMEDS_AttributeOpened.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeOpened.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeOpened.lo `test -f 'SALOMEDS_AttributeOpened.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeOpened.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeOpened.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeOpened.cxx' object='libSalomeDS_la-SALOMEDS_AttributeOpened.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeOpened.lo `test -f 'SALOMEDS_AttributeOpened.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeOpened.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePythonObject.lo: SALOMEDS_AttributePythonObject.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePythonObject.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePythonObject.lo `test -f 'SALOMEDS_AttributePythonObject.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePythonObject.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePythonObject.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePythonObject.cxx' object='libSalomeDS_la-SALOMEDS_AttributePythonObject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePythonObject.lo `test -f 'SALOMEDS_AttributePythonObject.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePythonObject.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeReal.lo: SALOMEDS_AttributeReal.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeReal.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeReal.lo `test -f 'SALOMEDS_AttributeReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeReal.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeReal.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeReal.cxx' object='libSalomeDS_la-SALOMEDS_AttributeReal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeReal.lo `test -f 'SALOMEDS_AttributeReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeReal.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSelectable.lo: SALOMEDS_AttributeSelectable.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSelectable.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSelectable.lo `test -f 'SALOMEDS_AttributeSelectable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSelectable.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSelectable.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSelectable.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSelectable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSelectable.lo `test -f 'SALOMEDS_AttributeSelectable.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSelectable.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo: SALOMEDS_AttributeSequenceOfInteger.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo `test -f 'SALOMEDS_AttributeSequenceOfInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfInteger.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSequenceOfInteger.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfInteger.lo `test -f 'SALOMEDS_AttributeSequenceOfInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfInteger.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo: SALOMEDS_AttributePersistentRef.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo `test -f 'SALOMEDS_AttributePersistentRef.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePersistentRef.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePersistentRef.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePersistentRef.cxx' object='libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePersistentRef.lo `test -f 'SALOMEDS_AttributePersistentRef.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePersistentRef.cxx
+
+libSalomeDS_la-SALOMEDS_AttributePixMap.lo: SALOMEDS_AttributePixMap.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributePixMap.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributePixMap.lo `test -f 'SALOMEDS_AttributePixMap.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePixMap.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributePixMap.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributePixMap.cxx' object='libSalomeDS_la-SALOMEDS_AttributePixMap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributePixMap.lo `test -f 'SALOMEDS_AttributePixMap.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributePixMap.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo: SALOMEDS_AttributeSequenceOfReal.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo `test -f 'SALOMEDS_AttributeSequenceOfReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfReal.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeSequenceOfReal.cxx' object='libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeSequenceOfReal.lo `test -f 'SALOMEDS_AttributeSequenceOfReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeSequenceOfReal.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo: SALOMEDS_AttributeTableOfInteger.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo `test -f 'SALOMEDS_AttributeTableOfInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfInteger.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfInteger.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfInteger.lo `test -f 'SALOMEDS_AttributeTableOfInteger.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfInteger.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo: SALOMEDS_AttributeTableOfReal.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo `test -f 'SALOMEDS_AttributeTableOfReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfReal.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfReal.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfReal.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfReal.lo `test -f 'SALOMEDS_AttributeTableOfReal.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfReal.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo: SALOMEDS_AttributeTableOfString.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo `test -f 'SALOMEDS_AttributeTableOfString.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfString.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTableOfString.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTableOfString.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTableOfString.lo `test -f 'SALOMEDS_AttributeTableOfString.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTableOfString.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTarget.lo: SALOMEDS_AttributeTarget.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTarget.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTarget.lo `test -f 'SALOMEDS_AttributeTarget.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTarget.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTarget.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTarget.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTarget.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTarget.lo `test -f 'SALOMEDS_AttributeTarget.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTarget.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTextColor.lo: SALOMEDS_AttributeTextColor.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTextColor.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTextColor.lo `test -f 'SALOMEDS_AttributeTextColor.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextColor.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextColor.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTextColor.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTextColor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTextColor.lo `test -f 'SALOMEDS_AttributeTextColor.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextColor.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo: SALOMEDS_AttributeTextHighlightColor.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo `test -f 'SALOMEDS_AttributeTextHighlightColor.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextHighlightColor.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTextHighlightColor.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTextHighlightColor.lo `test -f 'SALOMEDS_AttributeTextHighlightColor.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTextHighlightColor.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo: SALOMEDS_AttributeTreeNode.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo `test -f 'SALOMEDS_AttributeTreeNode.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTreeNode.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeTreeNode.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeTreeNode.cxx' object='libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeTreeNode.lo `test -f 'SALOMEDS_AttributeTreeNode.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeTreeNode.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeUserID.lo: SALOMEDS_AttributeUserID.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeUserID.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeUserID.lo `test -f 'SALOMEDS_AttributeUserID.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeUserID.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeUserID.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeUserID.cxx' object='libSalomeDS_la-SALOMEDS_AttributeUserID.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeUserID.lo `test -f 'SALOMEDS_AttributeUserID.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeUserID.cxx
+
+libSalomeDS_la-SALOMEDS_TMPFile_i.lo: SALOMEDS_TMPFile_i.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_TMPFile_i.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_TMPFile_i.Tpo" -c -o libSalomeDS_la-SALOMEDS_TMPFile_i.lo `test -f 'SALOMEDS_TMPFile_i.cxx' || echo '$(srcdir)/'`SALOMEDS_TMPFile_i.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_TMPFile_i.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_TMPFile_i.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_TMPFile_i.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_TMPFile_i.cxx' object='libSalomeDS_la-SALOMEDS_TMPFile_i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_TMPFile_i.lo `test -f 'SALOMEDS_TMPFile_i.cxx' || echo '$(srcdir)/'`SALOMEDS_TMPFile_i.cxx
+
+libSalomeDS_la-SALOMEDS_AttributeParameter.lo: SALOMEDS_AttributeParameter.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_AttributeParameter.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter.Tpo" -c -o libSalomeDS_la-SALOMEDS_AttributeParameter.lo `test -f 'SALOMEDS_AttributeParameter.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeParameter.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_AttributeParameter.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_AttributeParameter.cxx' object='libSalomeDS_la-SALOMEDS_AttributeParameter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_AttributeParameter.lo `test -f 'SALOMEDS_AttributeParameter.cxx' || echo '$(srcdir)/'`SALOMEDS_AttributeParameter.cxx
+
+libSalomeDS_la-SALOMEDS_IParameters.lo: SALOMEDS_IParameters.cxx
+@am__fastdepCXX_TRUE@  if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomeDS_la-SALOMEDS_IParameters.lo -MD -MP -MF "$(DEPDIR)/libSalomeDS_la-SALOMEDS_IParameters.Tpo" -c -o libSalomeDS_la-SALOMEDS_IParameters.lo `test -f 'SALOMEDS_IParameters.cxx' || echo '$(srcdir)/'`SALOMEDS_IParameters.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_IParameters.Tpo" "$(DEPDIR)/libSalomeDS_la-SALOMEDS_IParameters.Plo"; else rm -f "$(DEPDIR)/libSalomeDS_la-SALOMEDS_IParameters.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_IParameters.cxx' object='libSalomeDS_la-SALOMEDS_IParameters.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomeDS_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomeDS_la-SALOMEDS_IParameters.lo `test -f 'SALOMEDS_IParameters.cxx' || echo '$(srcdir)/'`SALOMEDS_IParameters.cxx
+
+SALOMEDS_Client-SALOMEDS_Client.o: SALOMEDS_Client.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOMEDS_Client-SALOMEDS_Client.o -MD -MP -MF "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo" -c -o SALOMEDS_Client-SALOMEDS_Client.o `test -f 'SALOMEDS_Client.cxx' || echo '$(srcdir)/'`SALOMEDS_Client.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo" "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Po"; else rm -f "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Client.cxx' object='SALOMEDS_Client-SALOMEDS_Client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOMEDS_Client-SALOMEDS_Client.o `test -f 'SALOMEDS_Client.cxx' || echo '$(srcdir)/'`SALOMEDS_Client.cxx
+
+SALOMEDS_Client-SALOMEDS_Client.obj: SALOMEDS_Client.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOMEDS_Client-SALOMEDS_Client.obj -MD -MP -MF "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo" -c -o SALOMEDS_Client-SALOMEDS_Client.obj `if test -f 'SALOMEDS_Client.cxx'; then $(CYGPATH_W) 'SALOMEDS_Client.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOMEDS_Client.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo" "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Po"; else rm -f "$(DEPDIR)/SALOMEDS_Client-SALOMEDS_Client.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Client.cxx' object='SALOMEDS_Client-SALOMEDS_Client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOMEDS_Client-SALOMEDS_Client.obj `if test -f 'SALOMEDS_Client.cxx'; then $(CYGPATH_W) 'SALOMEDS_Client.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOMEDS_Client.cxx'; fi`
+
+SALOMEDS_Server-SALOMEDS_Server.o: SALOMEDS_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOMEDS_Server-SALOMEDS_Server.o -MD -MP -MF "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo" -c -o SALOMEDS_Server-SALOMEDS_Server.o `test -f 'SALOMEDS_Server.cxx' || echo '$(srcdir)/'`SALOMEDS_Server.cxx; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo" "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Po"; else rm -f "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Server.cxx' object='SALOMEDS_Server-SALOMEDS_Server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOMEDS_Server-SALOMEDS_Server.o `test -f 'SALOMEDS_Server.cxx' || echo '$(srcdir)/'`SALOMEDS_Server.cxx
+
+SALOMEDS_Server-SALOMEDS_Server.obj: SALOMEDS_Server.cxx
+@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SALOMEDS_Server-SALOMEDS_Server.obj -MD -MP -MF "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo" -c -o SALOMEDS_Server-SALOMEDS_Server.obj `if test -f 'SALOMEDS_Server.cxx'; then $(CYGPATH_W) 'SALOMEDS_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOMEDS_Server.cxx'; fi`; \
+@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo" "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Po"; else rm -f "$(DEPDIR)/SALOMEDS_Server-SALOMEDS_Server.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='SALOMEDS_Server.cxx' object='SALOMEDS_Server-SALOMEDS_Server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SALOMEDS_Server_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SALOMEDS_Server-SALOMEDS_Server.obj `if test -f 'SALOMEDS_Server.cxx'; then $(CYGPATH_W) 'SALOMEDS_Server.cxx'; else $(CYGPATH_W) '$(srcdir)/SALOMEDS_Server.cxx'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-dist_salomescriptDATA: $(dist_salomescript_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomescriptdir)" || $(mkdir_p) "$(DESTDIR)$(salomescriptdir)"
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(dist_salomescriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         $(dist_salomescriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+
+uninstall-dist_salomescriptDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(dist_salomescript_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomescriptdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomescriptdir)/$$f"; \
+       done
+install-salomeincludeHEADERS: $(salomeinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)"
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+uninstall-salomeincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(salomeinclude_HEADERS)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../../salome_adm/unix
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(salomeincludedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+       clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_salomescriptDATA \
+       install-salomeincludeHEADERS
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
 
-@CONCLUDE@
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_salomescriptDATA \
+       uninstall-info-am uninstall-libLTLIBRARIES \
+       uninstall-salomeincludeHEADERS
 
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+       distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-binPROGRAMS \
+       install-data install-data-am install-dist_salomescriptDATA \
+       install-exec install-exec-am install-info install-info-am \
+       install-libLTLIBRARIES install-man \
+       install-salomeincludeHEADERS install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-binPROGRAMS \
+       uninstall-dist_salomescriptDATA uninstall-info-am \
+       uninstall-libLTLIBRARIES uninstall-salomeincludeHEADERS
 
+# 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.
+.NOEXPORT:
index 31e1bba018f6aca123a637d2ec148aa99ad2f41a..455095a1fd5a324fdf8ab948603d1b4a146dab95 100644 (file)
@@ -94,41 +94,40 @@ void SALOMEDS::unlock()
 extern "C"
 {
 SALOMEDS_EXPORT
-SALOMEDSClient_StudyManager* StudyManagerFactory()
+  SALOMEDSClient_StudyManager* StudyManagerFactory()
 {
   return new SALOMEDS_StudyManager();
 }
-
 SALOMEDS_EXPORT
-SALOMEDSClient_Study* StudyFactory(SALOMEDS::Study_ptr theStudy)
+  SALOMEDSClient_Study* StudyFactory(SALOMEDS::Study_ptr theStudy)
 {
   if(CORBA::is_nil(theStudy)) return NULL;
   return new SALOMEDS_Study(theStudy);
 }
 
 SALOMEDS_EXPORT
-SALOMEDSClient_SObject* SObjectFactory(SALOMEDS::SObject_ptr theSObject)
+  SALOMEDSClient_SObject* SObjectFactory(SALOMEDS::SObject_ptr theSObject)
 {
   if(CORBA::is_nil(theSObject)) return NULL;
   return new SALOMEDS_SObject(theSObject);
 }
 
 SALOMEDS_EXPORT
-SALOMEDSClient_SComponent* SComponentFactory(SALOMEDS::SComponent_ptr theSComponent)
+  SALOMEDSClient_SComponent* SComponentFactory(SALOMEDS::SComponent_ptr theSComponent)
 {
   if(CORBA::is_nil(theSComponent)) return NULL;
   return new SALOMEDS_SComponent(theSComponent);
 }
 
 SALOMEDS_EXPORT
-SALOMEDSClient_StudyBuilder* BuilderFactory(SALOMEDS::StudyBuilder_ptr theBuilder)
+  SALOMEDSClient_StudyBuilder* BuilderFactory(SALOMEDS::StudyBuilder_ptr theBuilder)
 {
   if(CORBA::is_nil(theBuilder)) return NULL;
   return new SALOMEDS_StudyBuilder(theBuilder);
 }
 
 SALOMEDS_EXPORT
-SALOMEDSClient_StudyManager* CreateStudyManager(CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa)
+  SALOMEDSClient_StudyManager* CreateStudyManager(CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa)
 {
   SALOME_NamingService namingService(orb);
   CORBA::Object_var obj = namingService.Resolve( "/myStudyManager" );
@@ -143,13 +142,13 @@ SALOMEDSClient_StudyManager* CreateStudyManager(CORBA::ORB_ptr orb, PortableServ
 }
 
 SALOMEDS_EXPORT
-SALOMEDSClient_IParameters* GetIParameters(const _PTR(AttributeParameter)& ap)
+  SALOMEDSClient_IParameters* GetIParameters(const _PTR(AttributeParameter)& ap)
 {
   return new SALOMEDS_IParameters(ap);
 }
 
 SALOMEDS_EXPORT
-SALOMEDS::SObject_ptr ConvertSObject(const _PTR(SObject)& theSObject)
+  SALOMEDS::SObject_ptr ConvertSObject(const _PTR(SObject)& theSObject)
 {
   
   SALOMEDS_SObject* so = _CAST(SObject, theSObject);
@@ -158,7 +157,7 @@ SALOMEDS::SObject_ptr ConvertSObject(const _PTR(SObject)& theSObject)
 }
 
 SALOMEDS_EXPORT
-SALOMEDS::Study_ptr ConvertStudy(const _PTR(Study)& theStudy)
+  SALOMEDS::Study_ptr ConvertStudy(const _PTR(Study)& theStudy)
 {
   SALOMEDS_Study* study = _CAST(Study, theStudy);
   if(!theStudy || !study) return SALOMEDS::Study::_nil();
@@ -166,7 +165,7 @@ SALOMEDS::Study_ptr ConvertStudy(const _PTR(Study)& theStudy)
 }
 
 SALOMEDS_EXPORT
-SALOMEDS::StudyBuilder_ptr ConvertBuilder(const _PTR(StudyBuilder)& theBuilder)
+  SALOMEDS::StudyBuilder_ptr ConvertBuilder(const _PTR(StudyBuilder)& theBuilder)
 {
   SALOMEDS_StudyBuilder* builder = _CAST(StudyBuilder, theBuilder);
   if(!theBuilder || !builder) return SALOMEDS::StudyBuilder::_nil(); 
index cc41826840fbac2e90bc030aebbe029916e77536..c27e95d2da7b9ac9102a2817e129ebc8e8f6a00f 100644 (file)
 #include "SALOMEDS_AttributeGraphic_i.hxx"
 #include "SALOMEDS_AttributeParameter_i.hxx"
 
-#define __CreateCORBAAttribute(TypeOfAttr,OutAttribute,CORBA_Name) if (strcmp(TypeOfAttr, #CORBA_Name) == 0) { \
+#define __CreateCORBAAttribute(CORBA_Name) if (strcmp(aTypeOfAttribute, #CORBA_Name) == 0) { \
     Handle(SALOMEDSImpl_##CORBA_Name) A = Handle(SALOMEDSImpl_##CORBA_Name)::DownCast(theAttr); \
     SALOMEDS_##CORBA_Name##_i* Attr = new SALOMEDS_##CORBA_Name##_i(A, theOrb); \
     attr_servant = Attr; \
-    OutAttribute = Attr->CORBA_Name::_this(); \
+    anAttribute = Attr->CORBA_Name::_this(); \
   }
 
 
-#define __CreateGenericCORBAAttribute(TypeOfAttr,OutAttribute) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeReal) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeInteger) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeSequenceOfReal) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeSequenceOfInteger) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeName) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeComment) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeIOR) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributePixMap) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeLocalID) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTableOfInteger) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTableOfReal) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTableOfString) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributePythonObject) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributePersistentRef) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeDrawable) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeSelectable) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeExpandable) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeOpened) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTextColor) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTextHighlightColor) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTarget) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeStudyProperties) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeExternalFileDef) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeFileType) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeFlags) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeGraphic) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeTreeNode) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeUserID) \
-__CreateCORBAAttribute(TypeOfAttr,OutAttribute,AttributeParameter)
+#define __CreateGenericCORBAAttribute \
+__CreateCORBAAttribute(AttributeReal) \
+__CreateCORBAAttribute(AttributeInteger) \
+__CreateCORBAAttribute(AttributeSequenceOfReal) \
+__CreateCORBAAttribute(AttributeSequenceOfInteger) \
+__CreateCORBAAttribute(AttributeName) \
+__CreateCORBAAttribute(AttributeComment) \
+__CreateCORBAAttribute(AttributeIOR) \
+__CreateCORBAAttribute(AttributePixMap) \
+__CreateCORBAAttribute(AttributeLocalID) \
+__CreateCORBAAttribute(AttributeTableOfInteger) \
+__CreateCORBAAttribute(AttributeTableOfReal) \
+__CreateCORBAAttribute(AttributeTableOfString) \
+__CreateCORBAAttribute(AttributePythonObject) \
+__CreateCORBAAttribute(AttributePersistentRef) \
+__CreateCORBAAttribute(AttributeDrawable) \
+__CreateCORBAAttribute(AttributeSelectable) \
+__CreateCORBAAttribute(AttributeExpandable) \
+__CreateCORBAAttribute(AttributeOpened) \
+__CreateCORBAAttribute(AttributeTextColor) \
+__CreateCORBAAttribute(AttributeTextHighlightColor) \
+__CreateCORBAAttribute(AttributeTarget) \
+__CreateCORBAAttribute(AttributeStudyProperties) \
+__CreateCORBAAttribute(AttributeExternalFileDef) \
+__CreateCORBAAttribute(AttributeFileType) \
+__CreateCORBAAttribute(AttributeFlags) \
+__CreateCORBAAttribute(AttributeGraphic) \
+__CreateCORBAAttribute(AttributeTreeNode) \
+__CreateCORBAAttribute(AttributeUserID) \
+__CreateCORBAAttribute(AttributeParameter)
 
 #endif
index 2fe15a6076bfca453604f33c7d8d96bc0fc37699..c100e89750a9fd304b1f967ddbf22da74feb4e1a 100644 (file)
 //  Module : SALOME
 //  $Header$
 
-#include "utilities.h"
-#include "HDFOI.hxx"
-
-#include "SALOMEDS_StudyManager_i.hxx"
-#include "SALOMEDS_AttributeName_i.hxx"
-
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
+#include "SALOMEDS_StudyManager_i.hxx"
+#include "SALOMEDS_AttributeName_i.hxx"
+#include "utilities.h"
+#include "HDFOI.hxx"
 
 using namespace std;
 
index f5f8d7aed4929e76277508ebf5efd0835248395f..f3642b26f8c0f7fb2c177cfb8d9c3361c8af2846 100644 (file)
@@ -119,11 +119,12 @@ SALOMEDS::GenericAttribute_ptr SALOMEDS_GenericAttribute_i::CreateAttribute
   }
 */
   // mpv: now servants Destroyed by common algos of CORBA
-  TCollection_AsciiString aTypeOfAttribute = Handle(SALOMEDSImpl_GenericAttribute)::
+  TCollection_AsciiString aClassType = Handle(SALOMEDSImpl_GenericAttribute)::
     DownCast(theAttr)->GetClassType();
+  char* aTypeOfAttribute = aClassType.ToCString();
   SALOMEDS::GenericAttribute_var anAttribute;
   SALOMEDS_GenericAttribute_i* attr_servant = NULL;
-  __CreateGenericCORBAAttribute( aTypeOfAttribute.ToCString(), anAttribute );
+  __CreateGenericCORBAAttribute
 
   return anAttribute._retn(); 
 }
index 041b7e3da22f9e894bc3203ebf9c9fe9ed312218..2ea1442ae1d25d1578eaaf8812aa743dd0410d8e 100644 (file)
@@ -61,7 +61,13 @@ SALOMEDS_SObject::SALOMEDS_SObject(SALOMEDS::SObject_ptr theSObject)
   long pid =  (long)getpid();
 #endif  
 
-  long addr = theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+#if SIZEOF_LONG == 4
+  long addr = 
+#else
+  int addr =
+#endif  
+  theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+
   if(_isLocal) {
     _local_impl = ((SALOMEDSImpl_SObject*)(addr));
     _corba_impl = SALOMEDS::SObject::_duplicate(theSObject);
index 2f4c6d9361a1bd27951a7381b0ae939118638af1..ef7ea33fcaee44eb74c74a825d381a8686aa7684 100644 (file)
@@ -83,7 +83,13 @@ SALOMEDS_Study::SALOMEDS_Study(SALOMEDS::Study_ptr theStudy)
   long pid =  (long)getpid();
 #endif  
 
-  long addr = theStudy->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+#if SIZEOF_LONG == 4
+  long addr = 
+#else
+  int addr =
+#endif
+    theStudy->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+
   if(_isLocal) {
     _local_impl = ((SALOMEDSImpl_Study*)(addr));
     _corba_impl = SALOMEDS::Study::_duplicate(theStudy);
@@ -639,10 +645,56 @@ void SALOMEDS_Study::EnableUseCaseAutoFilling(bool isEnabled)
 bool SALOMEDS_Study::DumpStudy(const string& thePath, const string& theBaseName, bool isPublished)
 {
   //SRN: Pure CORBA DumpStudy as it does more cleaning than the local one
+  if(CORBA::is_nil(_corba_impl)) GetStudy(); //If CORBA implementation is null then retrieve it
   bool ret = _corba_impl->DumpStudy(thePath.c_str(), theBaseName.c_str(), isPublished);
   return ret;
 }     
 
+void SALOMEDS_Study::SetStudyLock(const string& theLockerID)
+{
+  if (_isLocal) {
+    SALOMEDS::Locker lock;
+    _local_impl->SetStudyLock((char*)theLockerID.c_str());
+  }
+  else _corba_impl->SetStudyLock((char*)theLockerID.c_str());
+}
+bool SALOMEDS_Study::IsStudyLocked()
+{
+  bool isLocked;
+  if (_isLocal) {
+    SALOMEDS::Locker lock;
+    isLocked = _local_impl->IsStudyLocked();
+  }
+  else isLocked = _corba_impl->IsStudyLocked();
+  return isLocked;
+}
+void SALOMEDS_Study::UnLockStudy(const string& theLockerID)
+{
+  if(_isLocal) _local_impl->UnLockStudy((char*)theLockerID.c_str());
+  else _corba_impl->UnLockStudy((char*)theLockerID.c_str());
+}
+
+vector<string> SALOMEDS_Study::GetLockerID()
+{
+  std::vector<std::string> aVector;
+  int aLength, i;
+  if (_isLocal) {
+    SALOMEDS::Locker lock;
+
+    Handle(TColStd_HSequenceOfAsciiString) aSeq = _local_impl->GetLockerID();
+    aLength = aSeq->Length();
+    for (i = 1; i <= aLength; i++) aVector.push_back(aSeq->Value(i).ToCString());
+  }
+  else {
+    SALOMEDS::ListOfStrings_var aSeq = _corba_impl->GetLockerID();
+    aLength = aSeq->length();
+    for (i = 0; i < aLength; i++) aVector.push_back((char*)aSeq[i].in());
+  }
+  return aVector;
+}
+
 std::string SALOMEDS_Study::ConvertObjectToIOR(CORBA::Object_ptr theObject) 
 {
   CORBA::String_var objStr = _orb->object_to_string(theObject);
index 3856c94b0c6fa49b2774ab60e5abfeae063468c3..8babf0b6e7d76192cdadaa1332b9e8677c5022f3 100644 (file)
@@ -90,6 +90,11 @@ public:
   virtual _PTR(AttributeParameter) GetCommonParameters(const std::string& theID, int theSavePoint);
   virtual _PTR(AttributeParameter) GetModuleParameters(const std::string& theID, 
                                                       const std::string& theModuleName, int theSavePoint);
+  virtual void SetStudyLock(const std::string& theLockerID);
+  virtual bool IsStudyLocked();
+  virtual void UnLockStudy(const std::string& theLockerID);
+  virtual std::vector<std::string> GetLockerID();
+
   std::string ConvertObjectToIOR(CORBA::Object_ptr theObject);
   CORBA::Object_ptr ConvertIORToObject(const std::string& theIOR);     
 
index c6f32cc84e02679e1ff8c08fff0f77821ab67573..77145c92dbca3e311f1582ab04a8f7c43ed09f5a 100644 (file)
@@ -324,13 +324,21 @@ SALOMEDS::ListOfStrings* SALOMEDS_Study_i::GetObjectNames(const char* theContext
   SALOMEDS::Locker lock; 
 
   SALOMEDS::ListOfStrings_var aResult = new SALOMEDS::ListOfStrings;
-  if (strlen(theContext) == 0 && !_impl->HasCurrentContext()) throw SALOMEDS::Study::StudyInvalidContext();   
-  Handle(TColStd_HSequenceOfAsciiString) aSeq = _impl->GetObjectNames(TCollection_AsciiString((char*)theContext));
+
+  if (strlen(theContext) == 0 && !_impl->HasCurrentContext())
+    throw SALOMEDS::Study::StudyInvalidContext();
+
+  Handle(TColStd_HSequenceOfAsciiString) aSeq =
+    _impl->GetObjectNames(TCollection_AsciiString((char*)theContext));
+  if (_impl->GetErrorCode() == "InvalidContext")
+    throw SALOMEDS::Study::StudyInvalidContext();
+
   int aLength = aSeq->Length();
   aResult->length(aLength);
-  for(int anIndex = 1; anIndex <= aLength; anIndex++) {
+  for (int anIndex = 1; anIndex <= aLength; anIndex++) {
     aResult[anIndex-1] = CORBA::string_dup(TCollection_AsciiString(aSeq->Value(anIndex)).ToCString());
   }
+
   return aResult._retn();
 }
 
@@ -344,13 +352,21 @@ SALOMEDS::ListOfStrings* SALOMEDS_Study_i::GetDirectoryNames(const char* theCont
   SALOMEDS::Locker lock; 
 
   SALOMEDS::ListOfStrings_var aResult = new SALOMEDS::ListOfStrings;
-  if (strlen(theContext) == 0 && !_impl->HasCurrentContext()) throw SALOMEDS::Study::StudyInvalidContext();   
-  Handle(TColStd_HSequenceOfAsciiString) aSeq = _impl->GetDirectoryNames(TCollection_AsciiString((char*)theContext));
+
+  if (strlen(theContext) == 0 && !_impl->HasCurrentContext())
+    throw SALOMEDS::Study::StudyInvalidContext();
+
+  Handle(TColStd_HSequenceOfAsciiString) aSeq =
+    _impl->GetDirectoryNames(TCollection_AsciiString((char*)theContext));
+  if (_impl->GetErrorCode() == "InvalidContext")
+    throw SALOMEDS::Study::StudyInvalidContext();
+
   int aLength = aSeq->Length();
   aResult->length(aLength);
-  for(int anIndex = 1; anIndex <= aLength; anIndex++) {
+  for (int anIndex = 1; anIndex <= aLength; anIndex++) {
     aResult[anIndex-1] = CORBA::string_dup(TCollection_AsciiString(aSeq->Value(anIndex)).ToCString());
   }
+
   return aResult._retn();
 }
 
@@ -364,13 +380,21 @@ SALOMEDS::ListOfStrings* SALOMEDS_Study_i::GetFileNames(const char* theContext)
   SALOMEDS::Locker lock; 
 
   SALOMEDS::ListOfStrings_var aResult = new SALOMEDS::ListOfStrings;
-  if (strlen(theContext) == 0 && !_impl->HasCurrentContext()) throw SALOMEDS::Study::StudyInvalidContext();   
-  Handle(TColStd_HSequenceOfAsciiString) aSeq = _impl->GetFileNames(TCollection_AsciiString((char*)theContext));
+
+  if (strlen(theContext) == 0 && !_impl->HasCurrentContext())
+    throw SALOMEDS::Study::StudyInvalidContext();
+
+  Handle(TColStd_HSequenceOfAsciiString) aSeq =
+    _impl->GetFileNames(TCollection_AsciiString((char*)theContext));
+  if (_impl->GetErrorCode() == "InvalidContext")
+    throw SALOMEDS::Study::StudyInvalidContext();
+
   int aLength = aSeq->Length();
   aResult->length(aLength);
-  for(int anIndex = 1; anIndex <= aLength; anIndex++) {
+  for (int anIndex = 1; anIndex <= aLength; anIndex++) {
     aResult[anIndex-1] = CORBA::string_dup(TCollection_AsciiString(aSeq->Value(anIndex)).ToCString());
   }
+
   return aResult._retn();
 }
 
@@ -384,13 +408,19 @@ SALOMEDS::ListOfStrings* SALOMEDS_Study_i::GetComponentNames(const char* theCont
   SALOMEDS::Locker lock; 
 
   SALOMEDS::ListOfStrings_var aResult = new SALOMEDS::ListOfStrings;
-  if (strlen(theContext) == 0 && !_impl->HasCurrentContext()) throw SALOMEDS::Study::StudyInvalidContext();   
-  Handle(TColStd_HSequenceOfAsciiString) aSeq = _impl->GetComponentNames(TCollection_AsciiString((char*)theContext));
+
+  if (strlen(theContext) == 0 && !_impl->HasCurrentContext())
+    throw SALOMEDS::Study::StudyInvalidContext();
+
+  Handle(TColStd_HSequenceOfAsciiString) aSeq =
+    _impl->GetComponentNames(TCollection_AsciiString((char*)theContext));
+
   int aLength = aSeq->Length();
   aResult->length(aLength);
   for(int anIndex = 1; anIndex <= aLength; anIndex++) {
     aResult[anIndex-1] = CORBA::string_dup(TCollection_AsciiString(aSeq->Value(anIndex)).ToCString());
   }
+
   return aResult._retn();
 }
 
@@ -785,6 +815,60 @@ SALOMEDS::AttributeParameter_ptr SALOMEDS_Study_i::GetModuleParameters(const cha
   return SP->AttributeParameter::_this();
 }
 
+//============================================================================
+/*! Function : SetStudyLock
+ *  Purpose  : 
+ */
+//============================================================================
+void SALOMEDS_Study_i::SetStudyLock(const char* theLockerID)
+{
+  SALOMEDS::Locker lock; 
+  _impl->SetStudyLock(theLockerID);
+}
+
+//============================================================================
+/*! Function : IsStudyLocked
+ *  Purpose  : 
+ */
+//============================================================================
+bool SALOMEDS_Study_i::IsStudyLocked()
+{
+  SALOMEDS::Locker lock; 
+  return _impl->IsStudyLocked();
+}
+
+//============================================================================
+/*! Function : UnLockStudy
+ *  Purpose  : 
+ */
+//============================================================================
+void SALOMEDS_Study_i::UnLockStudy(const char* theLockerID)
+{
+  SALOMEDS::Locker lock; 
+  _impl->UnLockStudy(theLockerID);
+}
+
+//============================================================================
+/*! Function : GetLockerID
+ *  Purpose  : 
+ */
+//============================================================================
+SALOMEDS::ListOfStrings* SALOMEDS_Study_i::GetLockerID()
+{
+  SALOMEDS::Locker lock; 
+
+  SALOMEDS::ListOfStrings_var aResult = new SALOMEDS::ListOfStrings;
+
+  Handle(TColStd_HSequenceOfAsciiString) aSeq = _impl->GetLockerID();
+
+  int aLength = aSeq->Length();
+  aResult->length(aLength);
+  for(int anIndex = 1; anIndex <= aLength; anIndex++) {
+    aResult[anIndex-1] = CORBA::string_dup(TCollection_AsciiString(aSeq->Value(anIndex)).ToCString());
+  }
+  return aResult._retn();
+}
+
 //============================================================================
 /*! Function : GetDefaultScript
  *  Purpose  : 
index 9dba2243c50ee1674c271e12b190db3617b36189..dc617fe12b473f1636dcefd0b79335944c658b1c 100644 (file)
@@ -247,7 +247,7 @@ public:
   
   virtual SALOMEDS::Study::ListOfSObject* FindDependances(SALOMEDS::SObject_ptr anObject);
 
-  virtual SALOMEDS::AttributeStudyProperties_ptr SALOMEDS_Study_i::GetProperties();
+  virtual SALOMEDS::AttributeStudyProperties_ptr GetProperties();
 
   virtual char* GetLastModificationDate();
 
@@ -284,6 +284,14 @@ public:
                                                               const char* theModuleName, 
                                                               CORBA::Long theSavePoint);
 
+  virtual void SetStudyLock(const char* theLockerID);
+
+  virtual bool IsStudyLocked();
+
+  virtual void UnLockStudy(const char* theLockerID);
+
+  virtual SALOMEDS::ListOfStrings* GetLockerID();
+
   virtual char* GetDefaultScript(const char* theModuleName, const char* theShift);
 
   virtual CORBA::Boolean DumpStudy(const char* thePath, const char* theBaseName, CORBA::Boolean isPublished);
index 6221e9b83be82e411153acbb2f976b88e1473134..88443291b8860a17d17fa96ba769260d48a277a6 100644 (file)
@@ -58,7 +58,7 @@ using namespace std;
 void SALOMEDSTest::setUp()
 {
   TCollection_AsciiString kernel(getenv("KERNEL_ROOT_DIR"));
-  TCollection_AsciiString subPath("/share/salome/resources");
+  TCollection_AsciiString subPath("/share/salome/resources/kernel");
   TCollection_AsciiString csf_var = (kernel+subPath);
   setenv("CSF_PluginDefaults", csf_var.ToCString(), 0);
   setenv("CSF_SALOMEDS_ResourcesDefaults", csf_var.ToCString(), 0);
index f3cf67d8edef47cc0c44803dc9756330af26aac0..136bafd352efc7d36a16a76c4deb93d18b01ba1b 100644 (file)
@@ -86,6 +86,10 @@ public:
   virtual _PTR(AttributeParameter) GetCommonParameters(const std::string& theID, int theSavePoint) = 0;
   virtual _PTR(AttributeParameter) GetModuleParameters(const std::string& theID, 
                                                       const std::string& theModuleName, int theSavePoint) = 0;
+  virtual void SetStudyLock(const std::string& theLockerID) = 0;
+  virtual bool IsStudyLocked() = 0;
+  virtual void UnLockStudy(const std::string& theLockerID) = 0;
+  virtual std::vector<std::string> GetLockerID() = 0;
 };
 
 
index 702fbac032b64b5c40a913cda6567123c6187df8..752c9849d3f29d8bbfb3c23bd8b4e27e1259c76b 100644 (file)
@@ -40,7 +40,7 @@ public:
   template<class Y>
     explicit clt_shared_ptr(Y * p)
       {
-       reset(p);
+       boost::shared_ptr<T>::reset(p);
       }
   
   template<class Y>
index 0cfa7fda56dc720517a70f1ee4d79a5c4fbbf081..1ae8c0b0d6eba0c1c8a935b13031791beae9e97d 100644 (file)
@@ -52,9 +52,9 @@ public:
 Standard_EXPORT static const Standard_GUID& GetID() ;
 Standard_EXPORT static  Handle_SALOMEDSImpl_AttributeTarget Set(const TDF_Label& label) ;
 Standard_EXPORT SALOMEDSImpl_AttributeTarget();
-Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Add(const Handle(SALOMEDSImpl_SObject)& theSO);
-Standard_EXPORT Handle(TColStd_HSequenceOfTransient) SALOMEDSImpl_AttributeTarget::Get();
-Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Remove(const Handle(SALOMEDSImpl_SObject)& theSO);
+Standard_EXPORT void Add(const Handle(SALOMEDSImpl_SObject)& theSO);
+Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Get();
+Standard_EXPORT void Remove(const Handle(SALOMEDSImpl_SObject)& theSO);
 Standard_EXPORT TCollection_ExtendedString GetRelation() { return myRelation; }
 Standard_EXPORT void SetRelation(const TCollection_ExtendedString& theRelation); 
 Standard_EXPORT TDF_AttributeList& GetVariables() { return myVariables; }
index be1ca2adea1e5c070d95da2d86c48080523bd622..756df15c8b9ca15a2d61f2a5d5e4499f3767b303 100644 (file)
@@ -76,12 +76,12 @@ public:
   /*!
     Returns all parameter names of the given entry
    */
-  virtual std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterNames(const std::string& entry);
+  virtual std::vector<std::string> getAllParameterNames(const std::string& entry);
 
   /*!
     Returns all parameter  values of the given entry
    */
-  virtual std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterValues(const std::string& entry);
+  virtual std::vector<std::string> getAllParameterValues(const std::string& entry);
 
   /*!
     Returns a number of parameters of the given entry
index 373212d852fb2869db4eb3f5cdb9801dfbf0e018..f6c2fa1f6db92b51d30ce6864f771c63de3a0c82 100644 (file)
@@ -79,6 +79,7 @@ SALOMEDSImpl_Study::SALOMEDSImpl_Study(const Handle(TDocStd_Document)& doc,
   //Put on the root label a StudyHandle attribute to store the address of this object
   //It will be used to retrieve the study object by TDF_Label that belongs to the study
   SALOMEDSImpl_StudyHandle::Set(_doc->Main().Root(), this);
+  _lockers = new TColStd_HSequenceOfAsciiString();
 }
 
 
@@ -577,10 +578,6 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetObjectNames(const
   Handle(TColStd_HSequenceOfAsciiString) aResultSeq = new TColStd_HSequenceOfAsciiString;
   TDF_Label aLabel;
   if (theContext.IsEmpty()) {
-    if(_current.IsNull()) {
-      _errorCode = "InvalidContext";
-      return aResultSeq;
-    }
     aLabel = _current;
   } else {
     TDF_Label aTmp = _current;
@@ -588,8 +585,13 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetObjectNames(const
     aLabel = _current;
     _current = aTmp;
   }
-  TDF_ChildIterator anIter(aLabel, Standard_False); // iterate all subchildren at all sublevels
-  for(; anIter.More(); anIter.Next()) {
+  if (aLabel.IsNull()) {
+    _errorCode = "InvalidContext";
+    return aResultSeq;
+  }
+
+  TDF_ChildIterator anIter (aLabel, Standard_False); // iterate all subchildren at all sublevels
+  for (; anIter.More(); anIter.Next()) {
     TDF_Label aLabel = anIter.Value();
     Handle(SALOMEDSImpl_AttributeName) aName;
     if (aLabel.FindAttribute(SALOMEDSImpl_AttributeName::GetID(), aName)) aResultSeq->Append(aName->Value());
@@ -610,10 +612,6 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetDirectoryNames(con
   Handle(TColStd_HSequenceOfAsciiString) aResultSeq = new TColStd_HSequenceOfAsciiString;
   TDF_Label aLabel;
   if (theContext.IsEmpty()) {
-    if(_current.IsNull()) {
-      _errorCode = "InvalidContext";
-      return aResultSeq;
-    }
     aLabel = _current;
   } else {
     TDF_Label aTmp = _current;
@@ -621,8 +619,13 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetDirectoryNames(con
     aLabel = _current;
     _current = aTmp;
   }
-  TDF_ChildIterator anIter(aLabel, Standard_False); // iterate first-level children at all sublevels
-  for(; anIter.More(); anIter.Next()) {
+  if (aLabel.IsNull()) {
+    _errorCode = "InvalidContext";
+    return aResultSeq;
+  }
+
+  TDF_ChildIterator anIter (aLabel, Standard_False); // iterate first-level children at all sublevels
+  for (; anIter.More(); anIter.Next()) {
     TDF_Label aLabel = anIter.Value();
     Handle(SALOMEDSImpl_AttributeLocalID) anID;
     if (aLabel.FindAttribute(SALOMEDSImpl_AttributeLocalID::GetID(), anID)) {
@@ -650,10 +653,6 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetFileNames(const TC
   Handle(TColStd_HSequenceOfAsciiString) aResultSeq = new TColStd_HSequenceOfAsciiString;
   TDF_Label aLabel;
   if (theContext.IsEmpty()) {
-    if(_current.IsNull()) {
-      _errorCode = "InvalidContext";
-      return aResultSeq;
-    }
     aLabel = _current;
   } else {
     TDF_Label aTmp = _current;
@@ -661,16 +660,21 @@ Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetFileNames(const TC
     aLabel = _current;
     _current = aTmp;
   }
-  TDF_ChildIterator anIter(aLabel, Standard_False); // iterate all subchildren at all sublevels
-  for(; anIter.More(); anIter.Next()) {
+  if (aLabel.IsNull()) {
+    _errorCode = "InvalidContext";
+    return aResultSeq;
+  }
+
+  TDF_ChildIterator anIter (aLabel, Standard_False); // iterate all subchildren at all sublevels
+  for (; anIter.More(); anIter.Next()) {
     TDF_Label aLabel = anIter.Value();
     Handle(SALOMEDSImpl_AttributeLocalID) anID;
     if (aLabel.FindAttribute(SALOMEDSImpl_AttributeLocalID::GetID(), anID)) {
       if (anID->Value() == FILELOCALID) {
        Handle(SALOMEDSImpl_AttributePersistentRef) aName;
-       if(aLabel.FindAttribute(SALOMEDSImpl_AttributePersistentRef::GetID(), aName)) {
+       if (aLabel.FindAttribute(SALOMEDSImpl_AttributePersistentRef::GetID(), aName)) {
          TCollection_ExtendedString aFileName = aName->Value();
-         if(aFileName.Length() > 0)
+         if (aFileName.Length() > 0)
            aResultSeq->Append(aFileName.Split(strlen(FILEID)));
        }
       }
@@ -1357,7 +1361,7 @@ bool SALOMEDSImpl_Study::DumpStudy(const TCollection_AsciiString& thePath,
 
     if(aDriver == NULL) continue;
 
-    bool isValidScript;
+    bool isValidScript = false;
     long aStreamLength  = 0;
     Handle(SALOMEDSImpl_TMPFile) aStream = aDriver->DumpPython(this, isPublished, isValidScript, aStreamLength);
     if ( !isValidScript )
@@ -1527,28 +1531,28 @@ void SALOMEDSImpl_Study::Modify()
 //============================================================================
 Handle(SALOMEDSImpl_AttributeParameter) SALOMEDSImpl_Study::GetCommonParameters(const char* theID, int theSavePoint)
 {
-  if (theSavePoint < 0) return NULL;\r
-  Handle(SALOMEDSImpl_StudyBuilder) builder = NewBuilder();\r
-  Handle(SALOMEDSImpl_SObject) so = FindComponent((char*)theID);\r
-  if (so.IsNull()) so = builder->NewComponent((char*)theID);\r
-  Handle(SALOMEDSImpl_AttributeParameter) attParam;\r
-\r
-  if (theSavePoint > 0) { // Try to find SObject that contains attribute parameter ...\r
-    TDF_Label savePointLabel = so->GetLabel().FindChild( theSavePoint, /*create=*/0 );\r
-    if ( !savePointLabel.IsNull() )\r
-      so = GetSObject( savePointLabel );\r
-    else // ... if it does not exist - create a new one\r
-      so = builder->NewObjectToTag( so, theSavePoint );\r
-  }\r
-\r
-  if (!so.IsNull()) {\r
-    builder->FindAttribute(so, attParam, "AttributeParameter");\r
-    if ( attParam.IsNull() ) { // first call of GetCommonParameters on "Interface Applicative" component\r
-      Handle(TDF_Attribute) att = builder->FindOrCreateAttribute(so, "AttributeParameter");\r
-      attParam = Handle(SALOMEDSImpl_AttributeParameter)::DownCast( att );\r
-    }\r
-  }\r
-  return attParam;\r
+  if (theSavePoint < 0) return NULL;
+  Handle(SALOMEDSImpl_StudyBuilder) builder = NewBuilder();
+  Handle(SALOMEDSImpl_SObject) so = FindComponent((char*)theID);
+  if (so.IsNull()) so = builder->NewComponent((char*)theID);
+  Handle(SALOMEDSImpl_AttributeParameter) attParam;
+
+  if (theSavePoint > 0) { // Try to find SObject that contains attribute parameter ...
+    TDF_Label savePointLabel = so->GetLabel().FindChild( theSavePoint, /*create=*/0 );
+    if ( !savePointLabel.IsNull() )
+      so = GetSObject( savePointLabel );
+    else // ... if it does not exist - create a new one
+      so = builder->NewObjectToTag( so, theSavePoint );
+  }
+
+  if (!so.IsNull()) {
+    builder->FindAttribute(so, attParam, "AttributeParameter");
+    if ( attParam.IsNull() ) { // first call of GetCommonParameters on "Interface Applicative" component
+      Handle(TDF_Attribute) att = builder->FindOrCreateAttribute(so, "AttributeParameter");
+      attParam = Handle(SALOMEDSImpl_AttributeParameter)::DownCast( att );
+    }
+  }
+  return attParam;
 }
 
 //============================================================================
@@ -1583,3 +1587,51 @@ Handle(SALOMEDSImpl_AttributeParameter) SALOMEDSImpl_Study::GetModuleParameters(
   par->SetString("AP_MODULE_NAME", moduleName);
   return par;
 }
+
+//============================================================================
+/*! Function : SetStudyLock
+ *  Purpose  :
+ */
+//============================================================================
+void SALOMEDSImpl_Study::SetStudyLock(const char* theLockerID)
+{
+  _lockers->Append(TCollection_AsciiString((char*)theLockerID));
+}
+
+//============================================================================
+/*! Function : IsStudyLocked
+ *  Purpose  :
+ */
+//============================================================================
+bool SALOMEDSImpl_Study::IsStudyLocked()
+{
+  return (_lockers->Length() > 0);
+}
+
+//============================================================================
+/*! Function : UnLockStudy
+ *  Purpose  :
+ */
+//============================================================================
+void SALOMEDSImpl_Study::UnLockStudy(const char* theLockerID)
+{
+  int length = _lockers->Length(), pos = -1;
+  TCollection_AsciiString id((char*)theLockerID);
+  for(int i = 1; i<=length; i++) {
+    if(id == _lockers->Value(i)) {
+      pos = i;
+      break;
+    }
+  }
+  if(pos > 0) _lockers->Remove(pos);
+}
+  
+//============================================================================
+/*! Function : GetLockerID
+ *  Purpose  :
+ */
+//============================================================================
+Handle(TColStd_HSequenceOfAsciiString) SALOMEDSImpl_Study::GetLockerID()
+{
+  return _lockers;
+}
index daf7d39c0883cf753cf1cdbc9b903e42cdac2b1d..a1fe8805df14373949662b0e5a218d580ca57dab 100644 (file)
@@ -74,9 +74,10 @@ private:
   TDF_Label                _current;
   bool                     _autoFill; 
   TCollection_AsciiString  _errorCode;
-  Handle(SALOMEDSImpl_Callback)       _cb;
-  Handle(SALOMEDSImpl_StudyBuilder)   _builder;
-  Handle(SALOMEDSImpl_UseCaseBuilder) _useCaseBuilder;
+  Handle(TColStd_HSequenceOfAsciiString) _lockers;
+  Handle(SALOMEDSImpl_Callback)          _cb;
+  Handle(SALOMEDSImpl_StudyBuilder)      _builder;
+  Handle(SALOMEDSImpl_UseCaseBuilder)    _useCaseBuilder;
 
   DataMapOfAsciiStringTransient _mapOfSO;
   DataMapOfAsciiStringTransient _mapOfSCO;
@@ -209,7 +210,7 @@ public:
   
   Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) FindDependances(const Handle(SALOMEDSImpl_SObject)& anObject);
 
-  Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) SALOMEDSImpl_Study::GetProperties();
+  Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) GetProperties();
 
   Standard_EXPORT virtual TCollection_AsciiString GetLastModificationDate();
 
@@ -266,6 +267,18 @@ public:
                                                                              const char* theModuleName,
                                                                              int theSavePoint);
 
+  //Locks the study, theLockerID is identificator of the of the one who locked the study for ex. IOR
+  Standard_EXPORT void SetStudyLock(const char* theLockerID);
+
+  //Returns True if the study is locked
+  Standard_EXPORT bool IsStudyLocked();
+
+  //Unlocks the study
+  Standard_EXPORT void UnLockStudy(const char* theLockerID);
+  
+  //Returns an ID of the study locker
+  Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) GetLockerID();
+
 public:
   DEFINE_STANDARD_RTTI( SALOMEDSImpl_Study )
 
index 5c14d9cfc80ee156a731bad3f2232ab67308c8f0..05d9dec5e8378a2f93a19adc0eb54a459c6b03ad 100644 (file)
@@ -402,7 +402,7 @@ bool SALOMEDSImpl_StudyBuilder::LoadWith(const Handle(SALOMEDSImpl_SComponent)&
 
       if (isASCII) {
        Handle(TColStd_HSequenceOfAsciiString) aFilesToRemove = new TColStd_HSequenceOfAsciiString;
-       aFilesToRemove->Append(aHDFUrl);
+       aFilesToRemove->Append("hdf_from_ascii.hdf");
        SALOMEDSImpl_Tool::RemoveTemporaryFiles(SALOMEDSImpl_Tool::GetDirFromPath(aHDFUrl),
                                                 aFilesToRemove, true);
       }      
@@ -524,8 +524,8 @@ bool SALOMEDSImpl_StudyBuilder::FindAttribute(const Handle(SALOMEDSImpl_SObject)
   }
   TDF_Label Lab = anObject->GetLabel();
   if (Lab.FindAttribute(SALOMEDSImpl_SObject::GetGUID(aTypeOfAttribute), anAttribute)) {
-    //    _doc->Modify();  
-    //    ASV: 26.07.06 : commented out because NO MODIFICATION is done to attributes when calling FindAttribute()..
+    // commented out because NO MODIFICATION is done to attributes when calling FindAttribute()
+    // _doc->Modify();  
     return Standard_True;
   }
   return Standard_False;
index de90a0a9efcb135eb2a7a64ad64613e4ecff92bd..30029799dc362b0a8f5814428bd12f1b50bce337 100644 (file)
@@ -46,7 +46,7 @@ using namespace std;
 void SALOMEDSImplTest::setUp()
 {
   TCollection_AsciiString kernel(getenv("KERNEL_ROOT_DIR"));
-  TCollection_AsciiString subPath("/share/salome/resources");
+  TCollection_AsciiString subPath("/share/salome/resources/kernel");
   TCollection_AsciiString csf_var = (kernel+subPath);
   setenv("CSF_PluginDefaults", csf_var.ToCString(), 0);
   setenv("CSF_SALOMEDS_ResourcesDefaults", csf_var.ToCString(), 0);
index df4d15d1b3f476ae37949c2edd1c57deffb351e1..c256306e70695efa072200deab9efa13b215b91d 100644 (file)
@@ -50,6 +50,14 @@ int main (int argc, char * argv[])
   cout << "Manager is created " << endl;
   Handle(SALOMEDSImpl_Study) aStudy = aSM->NewStudy("SRN");
   cout << "Study with id = " << aStudy->StudyId() << " is created " << endl; 
+
+  cout << "Check the study lock, locking"   << endl;
+  aStudy->SetStudyLock("SRN");
+  cout << "Is study locked = " << aStudy->IsStudyLocked() << endl;
+  cout << "Get study locker : " << aStudy->GetLockerID() << endl;
+  aStudy->UnLockStudy("SRN");
+  cout << "Is study locked = " << aStudy->IsStudyLocked()  << endl;
+
   Handle(SALOMEDSImpl_StudyBuilder) aBuilder = aStudy->NewBuilder();
   cout << "StudyBuilder is created " << endl;
   Handle(SALOMEDSImpl_SComponent) aSC = aBuilder->NewComponent("TEST");
index 127f318353e7fd7a4e068a41732724eee8352067..d6c28d278135d24c61e1cde7700f0a477d292078 100755 (executable)
 #define _SALOME_UTILS_HXX_
 
 #ifdef WNT
- #if defined UTILS_EXPORTS
-  #if defined WIN32
-   #define UTILS_EXPORT __declspec( dllexport )
-  #else
-   #define UTILS_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define UTILS_EXPORT __declspec( dllimport )
-  #else
-   #define UTILS_EXPORT
-  #endif
- #endif
+# if defined UTILS_EXPORTS
+#  define UTILS_EXPORT __declspec( dllexport )
+# else
+#  define UTILS_EXPORT __declspec( dllimport )
+# endif
 #else
- #define UTILS_EXPORT
+define UTILS_EXPORT
 #endif
 
-#endif
\ No newline at end of file
+#endif
index 3078b86c3152d1870ff827f9647c7ff5701c64cc..eaee786cd19a6e0818a4a09b876b627b472c284d 100644 (file)
@@ -27,7 +27,7 @@
 # ifndef SALOME_STRING
 # define SALOME_STRING
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 # include <string>
 # include <sstream>
index e0764436fc8617abb2aa0db298fcb9edf97f19f7..4a07615d9beb9b69c1ea72984f16738c5b1d3507 100644 (file)
@@ -29,9 +29,9 @@
 # if  !defined ( __Utils_CommException_H__ )
 # define __Utils_CommException_H__ )
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
-# include "Utils_SALOME_Exception.hxx"
+#include "Utils_SALOME_Exception.hxx"
 
 class UTILS_EXPORT CommException : public SALOME_Exception
 {
index f4f79f8de86d7100410ce16a5baea2dd374d6f1d..c5c8f033e83e3b5aa6c45e8926384804b6bd5204 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef _UTILS_CORBAEXCEPTION_HXX_
 #define _UTILS_CORBAEXCEPTION_HXX_
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)
index 1137780253fa8b50846dde36924e9357dd0388b1..a2544b6cea186c30e0b0626c64a15e4fe55733e7 100644 (file)
@@ -29,7 +29,7 @@
 # if !defined( __DESTRUCTEUR_GENERIQUE__H__ )
 # define __DESTRUCTEUR_GENERIQUE__H__
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <list>
 #include <cassert>
index cb15d5aca7626a85053164cf7a2baaafbe5b8eff..41e24858d9e6b9b135c78a9264d6086f12129c88 100644 (file)
@@ -104,11 +104,11 @@ const char* get_adip( void )
 
        static hostent* he = ::gethostbyname( get_uname() );
        if ( he && he->h_addr_list && he->h_length >0 ) {
-         static char str[16];\r
-      unsigned i1 = (unsigned char)he->h_addr_list[0][0];\r
-      unsigned i2 = (unsigned char)he->h_addr_list[0][1];\r
-      unsigned i3 = (unsigned char)he->h_addr_list[0][2];\r
-      unsigned i4 = (unsigned char)he->h_addr_list[0][3];\r
+         static char str[16];
+      unsigned i1 = (unsigned char)he->h_addr_list[0][0];
+      unsigned i2 = (unsigned char)he->h_addr_list[0][1];
+      unsigned i3 = (unsigned char)he->h_addr_list[0][2];
+      unsigned i4 = (unsigned char)he->h_addr_list[0][3];
       sprintf ( str, "%03u.%03u.%03u.%03u", i1, i2, i3, i4 );
                return str;
        }
index de12af8173271459c0b2ae22a8d9b9542646fedc..a9e78653f58023253eadd7065316fd67bbcc777c 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef Utils_Mutex_HeaderFile
 #define Utils_Mutex_HeaderFile
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <pthread.h>
 
index 055b509b553546dc8f984dac9ec462f3c4361326..672d630c3180bf11b21c863bf8c316c754cc32eb 100644 (file)
@@ -29,7 +29,7 @@
 # if ! defined( __ORB_INIT_HXX__ )
 # define __ORB_INIT_HXX__
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include "omniORB4/CORBA.h" 
 
index 9dd9cbd944c31621322598b193bddb1985d9c744..9690036549121467d90095f8a76165c06573daf3 100644 (file)
@@ -29,7 +29,7 @@
 #if !defined( __Utils_SALOME_Exception_hxx__ )
 #define __Utils_SALOME_Exception_hxx__
 
-#include <SALOME_Utils.hxx>
+//#include "SALOME_Utils.hxx"
 
 # include <exception>
 # include <iostream>
 # define LOCALIZED(message) #message
 #endif
 
+//swig tool on Linux doesn't pass defines from header SALOME_Utils.hxx
+//therefore (temporary solution) defines are placed below
+
+#ifdef WNT
+# if defined UTILS_EXPORTS
+#  define UTILS_EXPORT __declspec( dllexport )
+# else
+#  define UTILS_EXPORT __declspec( dllimport )
+# endif
+#else
+# define UTILS_EXPORT
+#endif
+
 class UTILS_EXPORT SALOME_Exception : public std::exception
 {
 
index c2e014e4f8d97ce5ac03b26b8bb8ef13b2f80f43..8873946bb0e100fe42d8d010540d65aca0bdbe82 100644 (file)
@@ -29,7 +29,7 @@
 # if !defined( __SINGLETON__H__ )
 # define __SINGLETON__H__
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 # include "Utils_DESTRUCTEUR_GENERIQUE.hxx"
 # include <list>
index b1d0536ec9b6fd5e304e35a3be9bea409b36e139..a76ce46d8209bbef709fe5f39295fa848fdbb6f5 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef _UTILS_SIGNALSHANDLER_H_
 #define _UTILS_SIGNALSHANDLER_H_
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <map>
 typedef void (*TSigHandler)(int);
index 185d5fd3151846530a34c077c76ebba744c34c60..a8363e0309f8238254111896a58389233e9f51b8 100644 (file)
@@ -24,7 +24,7 @@
 //  File   : Utils_Timer.hxx
 //  Module : SALOME
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <stdlib.h>
 #include <time.h>