0021063: [CEA 434] Compilation using gnu compiler v4.5

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 38894b652aa71edcb2e99a2a54db4f313de22090..fdffc037ccccfab89641f00ba2808ef8ddaea0a1 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -142,7 +142,7 @@ SALOME_Container_CPPFLAGS =\
 
 SALOME_Container_LDADD = \
        libSalomeContainer.la \
-       ../Basics/libSALOMEBasics.la \
+       ../Basics/libSALOMEBasics.la ${COMMON_LIBS} \
        $(HDF5_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)
@@ -163,6 +163,7 @@ TestSalome_file_CPPFLAGS =\
 TestSalome_file_LDADD =\
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
+       $(COMMON_LIBS) \
        $(HDF5_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)

diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am
index 8023144bf32e4c92c12497c0adde81273decd274..c584eff3c94adcfe1ebc597eebe0a5b63161dfe0 100644 (file)
--- a/src/DSC/DSC_Basic/Makefile.am
+++ b/src/DSC/DSC_Basic/Makefile.am
@@ -89,4 +89,5 @@ SALOME_ConnectionManagerServer_CXXFLAGS = $(COMMON_CPPFLAGS)
 
 SALOME_ConnectionManagerServer_LDADD    = $(top_builddir)/idl/libSalomeIDLKernel.la \
                                          $(top_builddir)/src/NamingService/libSalomeNS.la \
-                                         $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la
+                                         $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la \
+                                         ${COMMON_LIBS}

diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am
index f083605badfaad0d929a62555a21f0476a0b46ca..6abe0dd677760a0927cb4df0e71568f7ccac8eb6 100644 (file)
--- a/src/LifeCycleCORBA/Test/Makefile.am
+++ b/src/LifeCycleCORBA/Test/Makefile.am
@@ -74,7 +74,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 \
-       $(top_builddir)/idl/libSalomeIDLKernel.la
+       $(top_builddir)/idl/libSalomeIDLKernel.la @CORBA_LIBS@
 
 #
 # ===============================================================

diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am
index 70616586a09f6fdaf49239af43b765a29d6ffb86..e6a67d82ab29a709cf380c9cb6f12098bd79716a 100644 (file)
--- a/src/Logger/Makefile.am
+++ b/src/Logger/Makefile.am
@@ -44,7 +44,10 @@ SALOME_Logger_Server_SOURCES = \
        SALOME_Logger_Server_main.cxx \
        SALOME_Logger_Server.hxx
 
-SALOME_Logger_Server_LDADD   = libSalomeLoggerServer.la
+SALOME_Logger_Server_LDADD   = libSalomeLoggerServer.la \
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
+       @CORBA_LIBS@
+
 SALOME_Logger_Server_CPPFLAGS =\
        -I$(top_builddir)/idl \
        -I$(srcdir)/../SALOMELocalTrace \

diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index b58a51233b2f99f7ec6d8242877a67505158deec..4060556539ad9dac03a7d4c47a06fa7147e1e8fa 100644 (file)
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -101,7 +101,7 @@ SALOME_ModuleCatalog_Server_CPPFLAGS =\
        $(COMMON_CPPFLAGS) 
 
 SALOME_ModuleCatalog_Server_LDADD   =\
-       libSalomeCatalog.la \
+       libSalomeCatalog.la ${COMMON_LIBS} \
        @CORBA_LIBS@
 
 # SALOME_ModuleCatalog_Client
@@ -110,5 +110,5 @@ SALOME_ModuleCatalog_Client_CPPFLAGS =\
        $(COMMON_CPPFLAGS)
 
 SALOME_ModuleCatalog_Client_LDADD   =\
-       libSalomeCatalog.la \
+       libSalomeCatalog.la ${COMMON_LIBS} \
        @CORBA_LIBS@

diff --git a/src/NamingService/Test/Makefile.am b/src/NamingService/Test/Makefile.am
index e3c9f84b9855bc9e4d2585ad673281b4f5e2eb34..2ddbd373feb1315fa8130a1cfb721c3f4be29d3a 100644 (file)
--- a/src/NamingService/Test/Makefile.am
+++ b/src/NamingService/Test/Makefile.am
@@ -61,7 +61,7 @@ COMMON_CPPFLAGS=\
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
        @CPPUNIT_LIBS@ \
-       ../libSalomeNS.la
+       ../libSalomeNS.la @CORBA_LIBS@
 
 #
 # ===============================================================
@@ -96,4 +96,4 @@ TestNamingService_LDADD    = \
        $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \
        $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \
        $(RPATH)/Basics/libSALOMEBasics.la \
-       $(top_builddir)/idl/libSalomeIDLKernel.la
+       $(top_builddir)/idl/libSalomeIDLKernel.la $(COMMON_LIBS)

diff --git a/src/Registry/Makefile.am b/src/Registry/Makefile.am
index 744a438b70e2b42508dd5323b2694a7622471682..34e244bb8c9b4bc8c8d754fd43c751935c7b5b97 100644 (file)
--- a/src/Registry/Makefile.am
+++ b/src/Registry/Makefile.am
@@ -60,7 +60,11 @@ libRegistry_la_LIBADD   =\
 bin_PROGRAMS = SALOME_Registry_Server
 SALOME_Registry_Server_SOURCES  = SALOME_Registry_Server.cxx
 SALOME_Registry_Server_LDADD    =\
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
        libRegistry.la \
+       ../NamingService/libSalomeNS.la \
+       ../Utils/libOpUtil.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
        @CORBA_LIBS@
 SALOME_Registry_Server_CPPFLAGS =\

diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am
index 654d45d8afd6c6f7cd635d7b94e55840cbf2c4d2..3782454026c7c81c6ec07719cd6af6f18d504035 100644 (file)
--- a/src/SALOMEDS/Makefile.am
+++ b/src/SALOMEDS/Makefile.am
@@ -287,6 +287,7 @@ bin_PROGRAMS = SALOMEDS_Server SALOMEDS_Client
 SALOMEDS_Server_SOURCES  = SALOMEDS_Server.cxx
 SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS)
 SALOMEDS_Server_LDADD    = libSalomeDS.la \
+       $(COMMON_LIBS) \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(CORBA_LIBS)
@@ -294,6 +295,7 @@ SALOMEDS_Server_LDADD    = libSalomeDS.la \
 SALOMEDS_Client_SOURCES  = SALOMEDS_Client.cxx
 SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS)
 SALOMEDS_Client_LDADD    = libSalomeDS.la \
+       $(COMMON_LIBS) \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(CORBA_LIBS)

diff --git a/src/SALOMEDS/Test/Makefile.am b/src/SALOMEDS/Test/Makefile.am
index 67e68fd05f6454104125d714c052eaff2c7e4292..cc49c240ce56768668eb7ee477a1da414020f864 100644 (file)
--- a/src/SALOMEDS/Test/Makefile.am
+++ b/src/SALOMEDS/Test/Makefile.am
@@ -145,4 +145,4 @@ dist_TestSALOMEDS_SOURCES  = TestSALOMEDS.cxx
 TestSALOMEDS_CPPFLAGS = $(COMMON_CPPFLAGS)
 TestSALOMEDS_LDADD    = libSALOMEDSTest.la \
                        $(RPATH)/Basics/libSALOMEBasics.la \
-                        $(CORBA_LIBS)
+                       $(CORBA_LIBS) $(COMMON_LIBS)

diff --git a/src/SALOMEDSImpl/Makefile.am b/src/SALOMEDSImpl/Makefile.am
index dcbf8a98dbe58364f5de23a3385ba2cd3cf2475f..35015b8eac3a511a4874d60c6817b0307139db1e 100644 (file)
--- a/src/SALOMEDSImpl/Makefile.am
+++ b/src/SALOMEDSImpl/Makefile.am
@@ -233,5 +233,5 @@ libSalomeDSImpl_la_LIBADD    = $(COMMON_LIBS) $(CORBA_LIBS)
 bin_PROGRAMS = testDS
 testDS_SOURCES  = testDS.cxx
 testDS_CPPFLAGS = $(COMMON_CPPFLAGS)
-testDS_LDADD    = libSalomeDSImpl.la \
+testDS_LDADD    = libSalomeDSImpl.la ../DF/libDF.la \
        $(HDF5_LIBS) $(CORBA_LIBS)

diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index eb2d16a490f326e6c5b684d1c843ec74777f4330..5d2434d14075819e19287898bb3918d853439abf 100644 (file)
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -97,11 +97,13 @@ bin_PROGRAMS = TestContainer TestLogger
 TestContainer_SOURCES  = TestContainer.cxx
 TestContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
 TestContainer_LDADD    = libSalomeTestComponentEngine.la \
+                        $(COMMON_LIBS) \
                         ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)
 
 TestLogger_SOURCES     = TestLogger.cxx
 TestLogger_CPPFLAGS    = $(COMMON_CPPFLAGS)
 TestLogger_LDADD       = libSalomeTestComponentEngine.la \
+                        $(COMMON_LIBS) \
                         ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)

diff --git a/src/Utils/Test/Makefile.am b/src/Utils/Test/Makefile.am
index 842191eeaf024727858224494ffa6345863c1fef..2dd63d0743c8a15c18c5ef1354171013469b5d76 100644 (file)
--- a/src/Utils/Test/Makefile.am
+++ b/src/Utils/Test/Makefile.am
@@ -83,5 +83,4 @@ libUtilsTest_la_LIBADD    = $(COMMON_LIBS)
 bin_PROGRAMS = TestUtils
 TestUtils_SOURCES  = TestUtils.cxx
 TestUtils_CPPFLAGS = $(COMMON_CPPFLAGS)
-TestUtils_LDADD    = libUtilsTest.la $(CORBA_LIBS)
-
+TestUtils_LDADD    = libUtilsTest.la $(COMMON_LIBS) $(CORBA_LIBS)