Fix linkage problem under GCC 4:

addition of libSalomeHDFPersist.so

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 16ea2072201749f1bd557e937349c1247777e969..a80f540ffb35034ab512113e87619318515a9a6e 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -143,6 +143,7 @@ SALOME_Container_CPPFLAGS =\
 SALOME_Container_LDADD = \
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
        $(HDF5_LIBS) \
        $(MPI_LIBS) \
        $(CORBA_LIBS) \
@@ -160,6 +161,7 @@ TestSalome_file_CPPFLAGS =\
 TestSalome_file_LDADD =\
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
        $(HDF5_LIBS) \
        $(MPI_LIBS) \
        $(CORBA_LIBS) \

diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am
index df3eabdc7caffa8fba53190e0021394cfe921561..21ab79d5e9d466c514ec6fad5bbd098b15eeabf6 100644 (file)
--- a/src/LifeCycleCORBA/Makefile.am
+++ b/src/LifeCycleCORBA/Makefile.am
@@ -110,6 +110,7 @@ Test_LifeCycleCORBA_LDADD    = \
        ../Registry/libRegistry.la \
        ../Notification/libSalomeNotification.la \
        ../Container/libSalomeContainer.la \
+       ../HDFPersist/libSalomeHDFPersist.la \  
        $(COMMON_LIBS) \
        @CORBA_LIBS@
 
@@ -125,6 +126,8 @@ TestContainerManager_LDADD    = \
        ../Registry/libRegistry.la \
        ../Notification/libSalomeNotification.la \
        ../Container/libSalomeContainer.la \
+       ../HDFPersist/libSalomeHDFPersist.la \
+       ../HDFPersist/libSalomeHDFPersist.la \  
        $(COMMON_LIBS) \
        @CORBA_LIBS@
 

diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am
index 9df7b5c692ba1f427f37d626acd43f43b02af09e..0ef29f954d823ce0ea47af8bafafeb8fd0e9cf00 100644 (file)
--- a/src/LifeCycleCORBA/Test/Makefile.am
+++ b/src/LifeCycleCORBA/Test/Makefile.am
@@ -75,6 +75,7 @@ COMMON_LIBS =\
        $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \
        $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \
        $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \
+       $(RPATH)/HDFPersist/libSalomeHDFPersist.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la
 
 #

diff --git a/src/SALOMEDSImpl/Makefile.am b/src/SALOMEDSImpl/Makefile.am
index de0b5f12e10896d3da6cd31a1c5ea4cf32b9b221..26e84661f4c40c45a1670c928cf773c3481ec860 100644 (file)
--- a/src/SALOMEDSImpl/Makefile.am
+++ b/src/SALOMEDSImpl/Makefile.am
@@ -217,4 +217,5 @@ bin_PROGRAMS = testDS
 testDS_SOURCES  = testDS.cxx
 testDS_CPPFLAGS = $(COMMON_CPPFLAGS)
 testDS_LDADD    = libSalomeDSImpl.la \
+       ../HDFPersist/libSalomeHDFPersist.la \  
        $(HDF5_LIBS)

diff --git a/src/SALOMEDSImpl/Test/Makefile.am b/src/SALOMEDSImpl/Test/Makefile.am
index 8ae6e4d857f1b677f39d1ddebb3f0f11b8d86e69..4be1a9e359fc50521d9f87efe4d3b9bb198d7ba8 100644 (file)
--- a/src/SALOMEDSImpl/Test/Makefile.am
+++ b/src/SALOMEDSImpl/Test/Makefile.am
@@ -79,6 +79,7 @@ COMMON_LIBS =\
        $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \
        $(RPATH)/DF/libDF.la \
        $(RPATH)/SALOMEDSImpl/libSalomeDSImpl.la \
+       $(RPATH)/HDFPersist/libSalomeHDFPersist.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la
 
 #

diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am
index b55f3b89d4e4686dda7646827cacdb74bc46ad00..b3ddeab6beb14ce7341fa9d5b96d99bb4bd271b0 100644 (file)
--- a/src/UnitTests/Makefile.am
+++ b/src/UnitTests/Makefile.am
@@ -70,7 +70,9 @@ endif
 UnitTests_LDADD    =\
        @CPPUNIT_LIBS@ \
        ../Basics/libSALOMEBasics.la \
-       ../SALOMELocalTrace/libSALOMELocalTrace.la ../SALOMELocalTrace/Test/libSALOMELocalTraceTest.la
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
+       ../SALOMELocalTrace/Test/libSALOMELocalTraceTest.la \
+       ../HDFPersist/libSalomeHDFPersist.la
 
 if CORBA_GEN
   UnitTests_LDADD    +=\