Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 8ad34ae091162226fd4d1de7b1eb562d > files > 22

salome-5.1.3-7mdv2010.1.src.rpm

--- src5.1.3/KERNEL_SRC_5.1.3/src/SALOMELocalTrace/Makefile.am.orig	2010-02-17 20:55:50.660065204 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/src/SALOMELocalTrace/Makefile.am	2010-02-17 20:57:19.643936706 -0200
@@ -48,4 +48,4 @@
 
 libSALOMELocalTrace_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 libSALOMELocalTrace_la_CPPFLAGS = -I$(srcdir)/../Basics
-libSALOMELocalTrace_la_LIBADD   = ../Basics/libSALOMEBasics.la
+libSALOMELocalTrace_la_LIBADD   = ../Basics/libSALOMEBasics.la -lomniORB4 -lpthread
--- src5.1.3/KERNEL_SRC_5.1.3/src/DSC/DSC_User/Datastream/Calcium/Makefile.am.orig	2010-02-18 16:12:07.343064264 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/src/DSC/DSC_User/Datastream/Calcium/Makefile.am	2010-02-18 17:46:15.554061360 -0200
@@ -119,11 +119,13 @@
 libSalomeCalcium_la_CXXFLAGS = $(COMMON_CPPFLAGS)
 
 libSalomeCalcium_la_LDFLAGS  = -no-undefined -version-info=0:0:0
+libSalomeCalcium_la_LIBADD = $(top_srcdir)/src/SALOMELocalTrace/libSALOMELocalTrace.la $(top_srcdir)/idl/libSalomeIDLKernel.la $(top_srcdir)/src/Utils/libOpUtil.la $(top_srcdir)/src/DSC/DSC_Basic/libSalomeDSCContainer.la $(top_srcdir)/src/DSC/DSC_User/libSalomeDSCSuperv.la
 
 AM_CFLAGS         = -fexceptions
 lib_LTLIBRARIES = libCalciumC.la
-libCalciumC_la_SOURCES = Calcium.c Calcium.cxx calciumf.c
+libCalciumC_la_SOURCES = Calcium.c calciumf.c
 libCalciumC_la_CXXFLAGS = $(COMMON_CPPFLAGS)
+libCalciumC_la_LIBADD = libSalomeCalcium.la -lstdc++
 
 #
 # ===============================================================
--- src5.1.3/KERNEL_SRC_5.1.3/src/LifeCycleCORBA/Test/Makefile.am.orig	2010-02-18 17:47:12.999064474 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/src/LifeCycleCORBA/Test/Makefile.am	2010-02-18 17:50:21.698060938 -0200
@@ -84,7 +84,7 @@
 libLifeCycleCORBATest_la_SOURCES = LifeCycleCORBATest.cxx
 libLifeCycleCORBATest_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 libLifeCycleCORBATest_la_LDFLAGS  = -no-undefined -version-info=0:0:0
-libLifeCycleCORBATest_la_LIBADD    = $(COMMON_LIBS)
+libLifeCycleCORBATest_la_LIBADD    = $(COMMON_LIBS) $(top_srcdir)/src/LifeCycleCORBA/libSalomeLifeCycleCORBA.la
 
 #
 # ===============================================================
@@ -95,7 +95,7 @@
 TestLifeCycleCORBA_SOURCES  = TestLifeCycleCORBA.cxx
 TestLifeCycleCORBA_CPPFLAGS = $(COMMON_CPPFLAGS)
 TestLifeCycleCORBA_LDADD    = \
-	libLifeCycleCORBATest.la ../libSalomeLifeCycleCORBA.la \
+	libLifeCycleCORBATest.la \
 	$(RPATH)/NamingService/Test/libNamingServiceTest.la \
 	$(COMMON_LIBS)
 
--- src5.1.3/KERNEL_SRC_5.1.3/src/MPIContainer/Makefile.am.orig	2010-02-18 18:37:06.750062915 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/src/MPIContainer/Makefile.am	2010-02-18 18:37:43.030061321 -0200
@@ -85,7 +85,7 @@
 libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx  MPIContainer_i.cxx
 libSalomeMPIContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 libSalomeMPIContainer_la_LDFLAGS  = -no-undefined -version-info=0:0:0
-libSalomeMPIContainer_la_LIBADD   = $(COMMON_LIBS)
+libSalomeMPIContainer_la_LIBADD   = $(COMMON_LIBS) $(MPI_LIBS)
 
 
 
--- src5.1.3/GUI_SRC_5.1.3/idl/Makefile.am.orig	2010-02-18 20:43:44.052065401 -0200
+++ src5.1.3/GUI_SRC_5.1.3/idl/Makefile.am	2010-02-18 20:45:43.626060548 -0200
@@ -44,7 +44,7 @@
 	-I$(top_builddir)/idl \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
 libSalomeIDLGUI_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libSalomeIDLGUI_la_LIBADD  = @CORBA_LIBS@
+libSalomeIDLGUI_la_LIBADD  = @CORBA_LIBS@ -L$(KERNEL_ROOT_DIR)/lib$(LIB_LOCATION_SUFFIX)/salome -lSalomeIDLKernel
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
--- src5.1.3/GUI_SRC_5.1.3/src/GLViewer/Makefile.am.orig	2010-02-18 21:09:00.166065110 -0200
+++ src5.1.3/GUI_SRC_5.1.3/src/GLViewer/Makefile.am	2010-02-18 21:09:21.625088400 -0200
@@ -114,4 +114,4 @@
 
 libGLViewer_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
 libGLViewer_la_LDFLAGS  = $(QT_MT_LIBS) $(CAS_KERNEL) $(OGL_LIBS)
-libGLViewer_la_LIBADD   = ../SUIT/libsuit.la
+libGLViewer_la_LIBADD   = ../SUIT/libsuit.la -lX11 -lXmu
--- src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/Makefile.am.orig	2010-02-22 19:10:59.096151049 -0300
+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/Makefile.am	2010-02-22 19:18:42.635150845 -0300
@@ -33,7 +33,9 @@
 	$(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ $(BOOST_CPPFLAGS) $(LIBXML_CXXFLAGS) \
 	-I$(srcdir)/.. -I$(srcdir)/../../MEDWrapper/V2_1/Core -I$(srcdir)/../../MEDMEM \
 	-I$(srcdir)/../../MEDMEMCppTest
-libMEDSPLITTERTest_la_LDFLAGS= $(MED2_LIBS) @CPPUNIT_LIBS@
+libMEDSPLITTERTest_la_LDFLAGS= $(MED2_LIBS) @CPPUNIT_LIBS@
+
+libMEDSPLITTERTest_la_LIBADD= ../../MEDMEM/libmedmem.la ../libmedsplitter.la
 
 if MED_ENABLE_KERNEL
     libMEDSPLITTERTest_la_CPPFLAGS+= ${KERNEL_CXXFLAGS}
--- src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEMComponent/Makefile.am.orig	2010-02-22 19:31:09.157735823 -0300
+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEMComponent/Makefile.am	2010-02-22 19:43:20.226308437 -0300
@@ -33,7 +33,10 @@
 	-I$(srcdir)/../ParaMEDMEM -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Bases -I$(srcdir)/../INTERP_KERNEL/Geometric2D -I$(srcdir)/../MEDCoupling -I$(srcdir)/../MEDCouplingCorba -I$(top_builddir)/idl
 
 # change motivated by the bug KERNEL4778.
-libparamedmemcompo_la_LDFLAGS= ../ParaMEDMEM/libparamedmem.la $(MPI_LIBS)
+libparamedmemcompo_la_LIBADD = ../ParaMEDMEM/libparamedmem.la \
+	../MEDCouplingCorba/libmedcouplingcorba.la ../MED/libMEDEngine.la \
+	$(KERNEL_LDFLAGS) -lSalomeMPIContainer \
+	$(MPI_LIBS) -lomniORB4
 
 LDADD= -lm
 
--- src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.am.orig	2010-02-23 16:54:39.901069905 -0300
+++ src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.am	2010-02-23 16:55:26.816596392 -0300
@@ -65,7 +65,8 @@
 	-lSalomeLifeCycleCORBA \
         -lSalomeResourcesManager \
 	-lSALOMEBasics \
-	-lSalomeIDLKernel
+	-lSalomeIDLKernel \
+	$(MPI_LIBS)
 
 AddComponent_CheckOfUndefined_CPPFLAGS = \
 	$(libAddComponentEngine_la_CPPFLAGS)
--- src5.1.3/COMPONENT_SRC_5.1.3/src/CalculatorComponent/Makefile.am.orig	2010-02-23 17:13:03.312596637 -0300
+++ src5.1.3/COMPONENT_SRC_5.1.3/src/CalculatorComponent/Makefile.am	2010-02-23 17:19:36.808596652 -0300
@@ -55,4 +55,6 @@
 	-lSalomeNotification \
 	-lSALOMELocalTrace \
 	$(MED_LDFLAGS) \
-	-lMEDEngine
+	-lMEDEngine \
+	-lmedmem \
+	-lMEDClientcmodule
--- src5.1.3/VISU_SRC_5.1.3/idl/Makefile.am.orig	2010-02-23 18:01:45.312598039 -0300
+++ src5.1.3/VISU_SRC_5.1.3/idl/Makefile.am	2010-02-23 18:01:52.185893739 -0300
@@ -44,7 +44,7 @@
 	-I$(top_builddir)/idl			\
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ @MED_CXXFLAGS@
 libSalomeIDLVISU_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libSalomeIDLVISU_la_LIBADD  = @CORBA_LIBS@ $(MED_LDFLAGS) -lSalomeIDLMED
+libSalomeIDLVISU_la_LIBADD  = @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeIDLMED
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
--- src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/src/gui/Makefile.am.orig	2010-02-23 20:29:37.100596869 -0300
+++ src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/src/gui/Makefile.am	2010-02-23 21:05:00.113869812 -0300
@@ -61,8 +61,8 @@
 
 libGHS3DPRLPluginGUI_la_LDFLAGS =		\
 	../GHS3DPRLPlugin/libGHS3DPRLEngine.la	\
-	${SMESH_LDFLAGS} -lSMESH		\
-	$(CAS_KERNEL)
+	${SMESH_LDFLAGS} -lSMESH -lsuit	-lqtx	\
+	$(CAS_KERNEL) $(QT_LIBS) $(KERNEL_LDFLAGS) -lSALOMEBasics
 
 # resources files
 nodist_salomeres_DATA =			\
--- src5.1.3/YACS_SRC_5.1.3/idl/Makefile.am.orig	2010-02-26 18:03:23.723639301 -0300
+++ src5.1.3/YACS_SRC_5.1.3/idl/Makefile.am	2010-02-26 18:20:31.600639444 -0300
@@ -33,7 +33,7 @@
 libSalomeIDLYACS_la_SOURCES = $(IDL_SRC)
 
 libSalomeIDLYACS_la_LIBADD = \
-	$(OMNIORB_LIBS)
+	$(OMNIORB_LIBS) -L$(KERNEL_ROOT_DIR)/lib$(LIB_LOCATION_SUFFIX)/salome -lSalomeIDLKernel
 
 libSalomeIDLYACS_la_CXXFLAGS = \
 	$(OMNIORB_INCLUDES) \
--- src5.1.3/YACS_SRC_5.1.3/src/runtime/Makefile.am.orig	2010-02-26 19:42:33.047639280 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/runtime/Makefile.am	2010-02-26 20:03:59.668639745 -0300
@@ -101,7 +101,7 @@
 	$(__dummy__)
 
 if SALOME_KERNEL
-SALOME_LIBS=$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeIDLKernel -lSalomeNS -lSalomeContainer -lSALOMEBasics
+SALOME_LIBS=$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeIDLKernel -lSalomeNS -lSalomeContainer -lSALOMEBasics -lOpUtil
 SALOME_INCL_PATH=-I$(KERNEL_ROOT_DIR)/include/salome 
 endif
 
@@ -110,11 +110,12 @@
 endif
 
 libYACSRuntimeSALOME_la_LIBADD = \
-	$(DSC_LIBS) $(SALOME_LIBS) $(OMNIORB_LIBS) $(PYTHON_LIBS) $(LIBXML_LIBS) \
+	$(DSC_LIBS) $(SALOME_LIBS) $(OMNIORB_LIBS) $(PYTHON_LDFLAGS) $(LIBXML_LIBS) \
 	../../idl/libSalomeIDLYACS.la \
 	../engine/libYACSlibEngine.la
 
 AM_CXXFLAGS = \
+	-I$(srcdir)/../engine \
 	$(THREAD_DEF) \
 	$(PYTHON_CPPFLAGS) \
 	$(OMNIORB_INCLUDES) \
@@ -122,7 +123,6 @@
 	$(OMNIORB_CXXFLAGS) \
 	$(SALOME_INCL_PATH) \
 	-I$(srcdir)/../bases \
-	-I$(srcdir)/../engine \
 	-I../../idl \
 	$(LIBXML_INCLUDES)
 
--- src5.1.3/YACS_SRC_5.1.3/src/yacsloader/Makefile.am.orig	2010-02-26 21:17:57.226638792 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/yacsloader/Makefile.am	2010-02-26 21:33:03.047638944 -0300
@@ -58,7 +58,9 @@
               -I$(srcdir)/../engine
 
 if SALOME_KERNEL
-SALOME_LIBS=$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA
+SALOME_LIBS=$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeHDFPersist \
+	-lResourcesManager -lSalomeResourcesManager -lSalomeNotification \
+	-lwith_loggerTraceCollector -lSALOMELocalTrace -lRegistry
 SALOME_INCL_PATH=-I$(KERNEL_ROOT_DIR)/include/salome
 endif
 
--- src5.1.3/COMPONENT_SRC_5.1.3/src/SIGNALSComponent/Makefile.am.orig	2009-12-01 13:00:14.000000000 -0200
+++ src5.1.3/COMPONENT_SRC_5.1.3/src/SIGNALSComponent/Makefile.am	2010-03-02 16:04:50.717516524 -0300
@@ -58,7 +58,8 @@
 	-lSalomeNS \
 	-lOpUtil \
 	-lRegistry \
-	-lSalomeNotification
+	-lSalomeNotification \
+	$(MPI_LIBS)
 
 SIGNALSComponent_CheckOfUndefined_CPPFLAGS = \
 	$(libSIGNALSComponentEngine_la_CPPFLAGS)
--- src5.1.3/YACS_SRC_5.1.3/src/engine_swig/Makefile.am.orig	2010-03-04 16:45:27.980481644 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/engine_swig/Makefile.am	2010-03-04 17:21:52.444956410 -0300
@@ -64,7 +64,7 @@
 
 _pilot_la_LDFLAGS  = -module
 
-_pilot_la_LIBADD = ../engine/libYACSlibEngine.la $(OMNIORB_LIBS) $(PYTHON_LIBS)
+_pilot_la_LIBADD = ../engine/libYACSlibEngine.la $(OMNIORB_LIBS) $(PYTHON_LDFLAGS)
 
 
 pypilotWRAP.cxx: pypilot.i pilot.i $(SWIGINCLUDES) engtypemaps.i pilotWRAP.cxx
@@ -78,7 +78,7 @@
 _pypilot_la_SOURCES =  pypilotWRAP.cxx
 _pypilot_la_CXXFLAGS =  $(THREAD_DEF) $(PYTHON_CPPFLAGS) $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) -I$(srcdir)/../engine -I$(srcdir)/../bases
 _pypilot_la_LDFLAGS  = -module
-_pypilot_la_LIBADD = ../engine/libYACSlibEngine.la $(OMNIORB_LIBS) $(PYTHON_LIBS)
+_pypilot_la_LIBADD = ../engine/libYACSlibEngine.la $(OMNIORB_LIBS) $(PYTHON_LDFLAGS)
 
 docengine.i:$(SWIGINCLUDES)
 	(cd $(srcdir)/../engine;doxygen ../../Misc/Doxyfile)
--- src5.1.3/YACS_SRC_5.1.3/src/yacsloader_swig/Makefile.am.orig	2010-03-10 20:18:20.579100598 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/yacsloader_swig/Makefile.am	2010-03-10 20:18:44.079096817 -0300
@@ -58,7 +58,7 @@
 
 _loader_la_LDFLAGS  = -module 
 
-_loader_la_LIBADD =  ../yacsloader/libYACSloader.la $(OMNIORB_LIBS) $(PYTHON_LIBS)
+_loader_la_LIBADD =  ../yacsloader/libYACSloader.la $(OMNIORB_LIBS) $(PYTHON_LDFLAGS)
 
 docyacsloader.i:$(SWIGINCLUDES)
 	(cd $(srcdir)/../yacsloader;doxygen ../../Misc/Doxyfile)
--- src5.1.3/MULTIPR_SRC_5.1.3/src/MULTIPRGUI/Makefile.am.orig	2010-04-28 23:19:57.000000000 +0000
+++ src5.1.3/MULTIPR_SRC_5.1.3/src/MULTIPRGUI/Makefile.am	2010-04-28 23:23:14.000000000 +0000
@@ -60,7 +60,7 @@
 libMULTIPR_la_LDFLAGS  = \
 	../../idl/libSalomeIDLMULTIPR.la \
 	../MULTIPR/libMULTIPREngine.la \
-	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \
+	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeDS \
 	$(GUI_LDFLAGS) \
         $(QT_LIBS) \
         $(MED_LDFLAGS) $(MED2_LIBS) \

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional