-#==============================================================================
-# File : Makefile.in
-# Author : Marc Tajchman
-#==============================================================================
+#
+# File : Makefile.in
+# Author : Sergey RUIN
+# Module : SALOME
-# source path
top_srcdir=@top_srcdir@
top_builddir=../..
srcdir=@srcdir@
@COMMENCE@
-EXPORT_HEADERS = SALOMEDS_Tool.hxx
+EXPORT_PYSCRIPTS = SALOME_DriverPy.py
+
+EXPORT_HEADERS= \
+ SALOMEDS_StudyManager_i.hxx \
+ SALOMEDS_Driver_i.hxx \
+ SALOMEDS_StudyManager.hxx \
+ SALOMEDS_Study_i.hxx \
+ SALOMEDS_Study.hxx \
+ SALOMEDS_SObject_i.hxx \
+ SALOMEDS_SObject.hxx \
+ SALOMEDS_SComponent_i.hxx \
+ SALOMEDS_SComponent.hxx \
+ SALOMEDS_GenericAttribute_i.hxx \
+ SALOMEDS_GenericAttribute.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_Tool.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_OCAFApplication.cxx \
SALOMEDS_GenericAttribute_i.cxx \
- SALOMEDS_IORAttribute.cxx \
- SALOMEDS_PersRefAttribute.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_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_AttributeTableOfString_i.cxx \
SALOMEDS_AttributeStudyProperties_i.cxx \
SALOMEDS_AttributePythonObject_i.cxx \
- SALOMEDS_SequenceOfRealAttribute.cxx \
- SALOMEDS_SequenceOfIntegerAttribute.cxx \
- SALOMEDS_DrawableAttribute.cxx \
- SALOMEDS_SelectableAttribute.cxx \
- SALOMEDS_ExpandableAttribute.cxx \
- SALOMEDS_OpenedAttribute.cxx \
- SALOMEDS_TextColorAttribute.cxx \
- SALOMEDS_TextHighlightColorAttribute.cxx \
- SALOMEDS_PixMapAttribute.cxx \
- SALOMEDS_LocalIDAttribute.cxx \
- SALOMEDS_TargetAttribute.cxx \
- SALOMEDS_TableOfIntegerAttribute.cxx \
- SALOMEDS_TableOfRealAttribute.cxx \
- SALOMEDS_TableOfStringAttribute.cxx \
- SALOMEDS_StudyPropertiesAttribute.cxx \
- SALOMEDS_PythonObjectAttribute.cxx \
- SALOMEDS_DataMapOfIntegerString_0.cxx \
- SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx \
- SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx \
- SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx \
- SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx \
- SALOMEDS_DataMapStringLabel_0.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
+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)
-CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+=$(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) $(OGL_LIBS) $(HDF5_LIBS) -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer
-# -L/opt/ccmalloc/lib -lccmalloc -ldl
-# -L/opt/efence/lib -lefence
+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
+#
+
+# _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
+#
+LDXMUFLAGS= -L/usr/X11R6/lib -lXmu
+LDFLAGS+=$(LDXMUFLAGS)
+LDFLAGSFORBIN= $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics
@CONCLUDE@