From: abd Date: Wed, 29 Oct 2008 09:08:27 +0000 (+0000) Subject: Fix linkage problem under GCC 4: X-Git-Tag: V5_1_0a3~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ef87c8aab5d6bbbeb3d6e4582c555b0183aeaa7f;p=modules%2Fkernel.git Fix linkage problem under GCC 4: addition of libSalomeHDFPersist.so --- diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index 16ea20722..a80f540ff 100644 --- 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 df3eabdc7..21ab79d5e 100644 --- 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 9df7b5c69..0ef29f954 100644 --- 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 de0b5f12e..26e84661f 100644 --- 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 8ae6e4d85..4be1a9e35 100644 --- 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 b55f3b89d..b3ddeab6b 100644 --- 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 +=\