merge from branch BR_For40_DSC tag mergeto_BR_Dev_For_4_0_28sep2007

[modules/kernel.git] / src / Container / Makefile.am

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 4b633933a2bb02b2a0f16cbd83b3e9ed7b29ffe3..4c8b65729af36bc58433ca07d956804714f8139d 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -42,7 +42,8 @@ salomeinclude_HEADERS = \
        SALOME_FileRef_i.hxx \
        SALOME_ContainerManager.hxx \
        Container_init_python.hxx \
-       SALOME_Container.hxx
+       SALOME_Container.hxx \
+       Salome_file_i.hxx
 
 # Scripts to be installed
 dist_salomescript_DATA =\
@@ -63,7 +64,6 @@ dist_salomescript_SCRIPTS=\
 COMMON_CPPFLAGS=\
        @PYTHON_INCLUDES@ \
        @MPI_INCLUDES@ \
-       @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \
        @QT_MT_INCLUDES@ \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
@@ -72,9 +72,10 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Registry \
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
+       -I$(srcdir)/../HDFPersist \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
-       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ 
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
@@ -85,11 +86,13 @@ COMMON_LIBS =\
        ../Utils/libOpUtil.la \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la\
-       @PYTHON_LIBS@ \
        @MPI_LIBS@ \
        @CORBA_LIBS@
 
+#      @PYTHON_LIBS@
+
 #
 # ===============================================================
 # Libraries targets
@@ -101,8 +104,9 @@ libSalomeContainer_la_SOURCES=\
        Container_i.cxx \
        SALOME_FileTransfer_i.cxx \
        SALOME_FileRef_i.cxx \
+       Container_init_python.cxx \
        SALOME_ContainerManager.cxx \
-       Container_init_python.cxx 
+       Salome_file_i.cxx
 
 libSalomeContainer_la_CPPFLAGS =\
        $(COMMON_CPPFLAGS)
@@ -112,8 +116,13 @@ libSalomeContainer_la_LDFLAGS  =\
        @LDEXPDYNFLAGS@
 
 libSalomeContainer_la_LIBADD =\
+       $(PYTHON_LIBS) \
        $(COMMON_LIBS)
 
+if WITH_PACO_PARALLEL
+libSalomeContainer_la_CPPFLAGS += -DWITH_PACO_PARALLEL @PACO_INCLUDES@
+libSalomeContainer_la_LIBADD += @PACO_LIBS@
+endif
 
 #
 # ===============================================================
@@ -121,6 +130,8 @@ libSalomeContainer_la_LIBADD =\
 # ===============================================================
 #
 bin_PROGRAMS = SALOME_Container SALOME_ContainerManagerServer
+noinst_PROGRAMS = TestSalome_file
+
 SALOME_Container_SOURCES =\
        SALOME_Container.cxx \
        SALOME_Container_SignalsHandler.cxx
@@ -128,15 +139,16 @@ SALOME_Container_SOURCES =\
 SALOME_Container_CPPFLAGS =\
        $(COMMON_CPPFLAGS)
 
-
 SALOME_Container_LDADD =\
        libSalomeContainer.la \
        $(COMMON_LIBS) \
        ../Basics/libSALOMEBasics.la
 
+SALOME_Container_LDFLAGS  =\
+-Xlinker -export-dynamic
 
 SALOME_ContainerManagerServer_SOURCES =\
-       SALOME_ContainerManagerServer.cxx
+       SALOME_ContainerManagerServer.cxx 
 
 SALOME_ContainerManagerServer_CPPFLAGS=\
        $(COMMON_CPPFLAGS)
@@ -145,3 +157,14 @@ SALOME_ContainerManagerServer_LDADD =\
        libSalomeContainer.la \
        $(COMMON_LIBS) \
        ../Basics/libSALOMEBasics.la
+
+TestSalome_file_SOURCES =\
+       TestSalome_file.cxx
+
+TestSalome_file_CPPFLAGS =\
+       $(COMMON_CPPFLAGS)
+
+TestSalome_file_LDADD =\
+       libSalomeContainer.la \
+       $(COMMON_LIBS) \
+       ../Basics/libSALOMEBasics.la