From c5616ac31c2da44bb4a951d900d70c93be4f3147 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 10 Nov 2010 15:53:51 +0000 Subject: [PATCH] 0021063: [CEA 434] Compilation using gnu compiler v4.5 --- src/Container/Makefile.am | 3 ++- src/DSC/DSC_Basic/Makefile.am | 3 ++- src/LifeCycleCORBA/Test/Makefile.am | 2 +- src/Logger/Makefile.am | 5 ++++- src/ModuleCatalog/Makefile.am | 4 ++-- src/NamingService/Test/Makefile.am | 4 ++-- src/Registry/Makefile.am | 4 ++++ src/SALOMEDS/Makefile.am | 2 ++ src/SALOMEDS/Test/Makefile.am | 2 +- src/SALOMEDSImpl/Makefile.am | 2 +- src/TestContainer/Makefile.am | 2 ++ src/Utils/Test/Makefile.am | 3 +-- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index 38894b652..fdffc037c 100644 --- 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 8023144bf..c584eff3c 100644 --- 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 f083605ba..6abe0dd67 100644 --- 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 70616586a..e6a67d82a 100644 --- 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 b58a51233..406055653 100644 --- 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 e3c9f84b9..2ddbd373f 100644 --- 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 744a438b7..34e244bb8 100644 --- 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 654d45d8a..378245402 100644 --- 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 67e68fd05..cc49c240c 100644 --- 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 dcbf8a98d..35015b8ea 100644 --- 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 eb2d16a49..5d2434d14 100644 --- 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 842191eea..2dd63d074 100644 --- 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) -- 2.39.2