Moved some functionality to VTKViewer_Utilities.h

[modules/kernel.git] / src / SALOMEDS / Makefile.in

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index 69af4214b051f39e6e1ac62131e65e7d161373c3..5a4adbf4e62687107bfe9d9da9e834b4685e4963 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -26,13 +26,17 @@
 #  Module : SALOME
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl
 
 
 @COMMENCE@
 
+EXPORT_HEADERS= \
+       SALOMEDS_StudyManager_i.hxx \
+       SALOMEDS_OCAFApplication.hxx \
+       Handle_SALOMEDS_OCAFApplication.hxx
 
 # Libraries targets
 
@@ -50,8 +54,12 @@ LIB_SRC =    \
                  SALOMEDS_OCAFApplication.cxx \
                  SALOMEDS_GenericAttribute_i.cxx \
                  SALOMEDS_IORAttribute.cxx \
+                 SALOMEDS_ExternalFileDef.cxx \
+                 SALOMEDS_FileType.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 \
@@ -62,6 +70,8 @@ LIB_SRC =     \
                  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  \
@@ -81,6 +91,8 @@ LIB_SRC =     \
                  SALOMEDS_SelectableAttribute.cxx \
                  SALOMEDS_ExpandableAttribute.cxx  \
                  SALOMEDS_OpenedAttribute.cxx \
+                 SALOMEDS_FlagsAttribute.cxx \
+                 SALOMEDS_GraphicAttribute.cxx \
                  SALOMEDS_TextColorAttribute.cxx \
                  SALOMEDS_TextHighlightColorAttribute.cxx \
                  SALOMEDS_PixMapAttribute.cxx \
@@ -101,15 +113,23 @@ LIB_SRC =         \
 # 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_ContainerManager.idl
 BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
 BIN_CLIENT_IDL = 
+LIB_CLIENT_IDL = SALOME_Component.idl SALOME_GenericObj.idl
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer $(CAS_LDPATH) -lTKCAF
-# -L/opt/ccmalloc/lib -lccmalloc -ldl
-# -L/opt/efence/lib -lefence
+LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace $(CAS_LDPATH) -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeResourcesManager
+
+# _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) -lRegistry -lSalomeNotification -lSALOMETraceCollector
 
 @CONCLUDE@